diff --git a/docs-android/app/build.gradle b/docs-android/app/build.gradle
index 062f5655..9252b12e 100644
--- a/docs-android/app/build.gradle
+++ b/docs-android/app/build.gradle
@@ -50,9 +50,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:recyclerview-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:design:23.4.0'
     compile 'it.sephiroth.android.library.imagezoom:imagezoom:1.0.5'
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
index 46a17f55..06297596 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
@@ -16,6 +16,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
+import android.text.method.LinkMovementMethod;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -51,7 +52,7 @@ import com.sismics.docs.resource.FileResource;
 import com.sismics.docs.service.FileUploadService;
 import com.sismics.docs.util.NetworkUtil;
 import com.sismics.docs.util.PreferenceUtil;
-import com.sismics.docs.util.TagUtil;
+import com.sismics.docs.util.SpannableUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -176,9 +177,11 @@ public class DocumentViewActivity extends AppCompatActivity {
         }
 
         // Fill the layout
+        // Create date
         TextView createdDateTextView = (TextView) findViewById(R.id.createdDateTextView);
         createdDateTextView.setText(date);
 
+        // Description
         TextView descriptionTextView = (TextView) findViewById(R.id.descriptionTextView);
         if (description.isEmpty() || document.isNull("description")) {
             descriptionTextView.setVisibility(View.GONE);
@@ -187,17 +190,20 @@ public class DocumentViewActivity extends AppCompatActivity {
             descriptionTextView.setText(description);
         }
 
+        // Tags
         TextView tagTextView = (TextView) findViewById(R.id.tagTextView);
         if (tags.length() == 0) {
             tagTextView.setVisibility(View.GONE);
         } else {
             tagTextView.setVisibility(View.VISIBLE);
-            tagTextView.setText(TagUtil.buildSpannable(tags));
+            tagTextView.setText(SpannableUtil.buildSpannableTags(tags));
         }
 
+        // Language
         ImageView languageImageView = (ImageView) findViewById(R.id.languageImageView);
         languageImageView.setImageResource(getResources().getIdentifier(language, "drawable", getPackageName()));
 
+        // Shared status
         ImageView sharedImageView = (ImageView) findViewById(R.id.sharedImageView);
         sharedImageView.setVisibility(shared ? View.VISIBLE : View.GONE);
 
@@ -679,10 +685,54 @@ public class DocumentViewActivity extends AppCompatActivity {
                         startActivity(intent);
                     }
                 });
+
+                // Contributors
+                TextView contributorsTextView = (TextView) findViewById(R.id.contributorsTextView);
+                contributorsTextView.setText(SpannableUtil.buildSpannableContributors(document.optJSONArray("contributors")));
+
+                // Relations
+                JSONArray relations = document.optJSONArray("relations");
+                if (relations.length() > 0) {
+                    TextView relationsTextView = (TextView) findViewById(R.id.relationsTextView);
+                    relationsTextView.setMovementMethod(LinkMovementMethod.getInstance());
+                    relationsTextView.setText(SpannableUtil.buildSpannableRelations(relations));
+                } else {
+                    findViewById(R.id.relationsLayout).setVisibility(View.GONE);
+                }
+
+                // Additional dublincore metadata
+                displayDublincoreMetadata(R.id.subjectTextView, R.id.subjectLayout, "subject");
+                displayDublincoreMetadata(R.id.identifierTextView, R.id.identifierLayout, "identifier");
+                displayDublincoreMetadata(R.id.publisherTextView, R.id.publisherLayout, "publisher");
+                displayDublincoreMetadata(R.id.formatTextView, R.id.formatLayout, "format");
+                displayDublincoreMetadata(R.id.sourceTextView, R.id.sourceLayout, "source");
+                displayDublincoreMetadata(R.id.typeTextView, R.id.typeLayout, "type");
+                displayDublincoreMetadata(R.id.coverageTextView, R.id.coverageLayout, "coverage");
+                displayDublincoreMetadata(R.id.rightsTextView, R.id.rightsLayout, "rights");
             }
         });
     }
 
+    /**
+     * Display a dublincore metadata.
+     *
+     * @param textViewId TextView ID
+     * @param blockViewId View ID
+     * @param name Name
+     */
+    private void displayDublincoreMetadata(int textViewId, int blockViewId, String name) {
+        if (document == null) return;
+        String value = document.optString(name);
+        if (document.isNull(name) || value.isEmpty()) {
+            findViewById(blockViewId).setVisibility(View.GONE);
+            return;
+        }
+
+        findViewById(blockViewId).setVisibility(View.VISIBLE);
+        TextView textView = (TextView) findViewById(textViewId);
+        textView.setText(value);
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
         switch (view.getId()) {
diff --git a/docs-android/app/src/main/java/com/sismics/docs/adapter/DocListAdapter.java b/docs-android/app/src/main/java/com/sismics/docs/adapter/DocListAdapter.java
index bd68ddce..5450db0a 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/adapter/DocListAdapter.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/adapter/DocListAdapter.java
@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sismics.docs.R;
-import com.sismics.docs.util.TagUtil;
+import com.sismics.docs.util.SpannableUtil;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -69,7 +69,7 @@ public class DocListAdapter extends RecyclerView.Adapter<DocListAdapter.ViewHold
         holder.titleTextView.setText(document.optString("title"));
 
         JSONArray tags = document.optJSONArray("tags");
-        holder.subtitleTextView.setText(TagUtil.buildSpannable(tags));
+        holder.subtitleTextView.setText(SpannableUtil.buildSpannableTags(tags));
 
         String date = DateFormat.getDateFormat(holder.dateTextView.getContext()).format(new Date(document.optLong("create_date")));
         holder.dateTextView.setText(date);
diff --git a/docs-android/app/src/main/java/com/sismics/docs/ui/view/NonScrollListView.java b/docs-android/app/src/main/java/com/sismics/docs/ui/view/NonScrollListView.java
new file mode 100644
index 00000000..f40f4dce
--- /dev/null
+++ b/docs-android/app/src/main/java/com/sismics/docs/ui/view/NonScrollListView.java
@@ -0,0 +1,33 @@
+package com.sismics.docs.ui.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/**
+ * Non-scrollable ListView.
+ * All items are visible from the start.
+ *
+ * @author http://stackoverflow.com/questions/18813296/non-scrollable-listview-inside-scrollview/24629341#24629341
+ */
+public class NonScrollListView extends ListView {
+
+    public NonScrollListView(Context context) {
+        super(context);
+    }
+    public NonScrollListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public NonScrollListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            int heightMeasureSpec_custom = MeasureSpec.makeMeasureSpec(
+                    Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
+            ViewGroup.LayoutParams params = getLayoutParams();
+            params.height = getMeasuredHeight();    
+    }
+}
\ No newline at end of file
diff --git a/docs-android/app/src/main/java/com/sismics/docs/util/SpannableUtil.java b/docs-android/app/src/main/java/com/sismics/docs/util/SpannableUtil.java
new file mode 100644
index 00000000..c0daf560
--- /dev/null
+++ b/docs-android/app/src/main/java/com/sismics/docs/util/SpannableUtil.java
@@ -0,0 +1,85 @@
+package com.sismics.docs.util;
+
+import android.graphics.Color;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+/**
+ * Utility class for tags.
+ *
+ * @author bgamard.
+ */
+public class SpannableUtil {
+    /**
+     * Create a colored spannable from tags.
+     *
+     * @param tags Tags
+     * @return Colored spannable
+     */
+    public static Spannable buildSpannableTags(JSONArray tags) {
+        return buildSpannable(tags, "name", "color");
+    }
+
+    /**
+     * Create a spannable for contributors.
+     *
+     * @param contributors Contributors
+     * @return Spannable
+     */
+    public static Spannable buildSpannableContributors(JSONArray contributors) {
+        return buildSpannable(contributors, "username", null);
+    }
+
+    /**
+     * Create a spannable for relations.
+     *
+     * @param relations Relations
+     * @return Spannable
+     */
+    public static Spannable buildSpannableRelations(JSONArray relations) {
+        return buildSpannable(relations, "title", null);
+    }
+
+    /**
+     * Create a spannable from a JSONArray.
+     *
+     * @param array JSONArray
+     * @param valueName Name of the value part
+     * @param colorName Name of the color part (optional)
+     * @return Spannable
+     */
+    private static Spannable buildSpannable(JSONArray array, String valueName, String colorName) {
+        SpannableStringBuilder builder = new SpannableStringBuilder();
+
+        for (int i = 0; i < array.length(); i++) {
+            final JSONObject tag = array.optJSONObject(i);
+            int start = builder.length();
+            builder.append(" ").append(tag.optString(valueName)).append(" ");
+            builder.setSpan(new ForegroundColorSpan(Color.WHITE), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            builder.setSpan(new BackgroundColorSpan(Color.parseColor(tag.optString(colorName, "#5bc0de"))), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            /*
+            TODO : Make tags, relations and contributors clickable
+            builder.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(View widget) {
+                }
+
+                @Override
+                public void updateDrawState(TextPaint ds) {
+                    super.updateDrawState(ds);
+                    ds.setColor(Color.WHITE);
+                    ds.setUnderlineText(false);
+                }
+            }, start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
+            builder.append(" ");
+        }
+
+        return builder;
+    }
+}
diff --git a/docs-android/app/src/main/java/com/sismics/docs/util/TagUtil.java b/docs-android/app/src/main/java/com/sismics/docs/util/TagUtil.java
deleted file mode 100644
index d2af026d..00000000
--- a/docs-android/app/src/main/java/com/sismics/docs/util/TagUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.sismics.docs.util;
-
-import android.graphics.Color;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ForegroundColorSpan;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-/**
- * Utility class for tags.
- *
- * @author bgamard.
- */
-public class TagUtil {
-    /**
-     * Create a colored spannable from tags.
-     *
-     * @param tags Tags
-     * @return Colored spannable
-     */
-    public static Spannable buildSpannable(JSONArray tags) {
-        SpannableStringBuilder builder = new SpannableStringBuilder();
-
-        for (int i = 0; i < tags.length(); i++) {
-            JSONObject tag = tags.optJSONObject(i);
-            int start = builder.length();
-            builder.append(" ").append(tag.optString("name")).append(" ");
-            builder.setSpan(new ForegroundColorSpan(Color.WHITE), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            builder.setSpan(new BackgroundColorSpan(Color.parseColor(tag.optString("color"))), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            builder.append(" ");
-        }
-
-        return builder;
-    }
-}
diff --git a/docs-android/app/src/main/res/layout/document_view_activity.xml b/docs-android/app/src/main/res/layout/document_view_activity.xml
index 0068dceb..fb50540a 100644
--- a/docs-android/app/src/main/res/layout/document_view_activity.xml
+++ b/docs-android/app/src/main/res/layout/document_view_activity.xml
@@ -142,241 +142,523 @@
 
     <!-- Right drawer -->
 
-    <LinearLayout
+    <ScrollView
         android:id="@+id/right_drawer"
         android:layout_width="300dp"
         android:layout_height="match_parent"
-        android:layout_gravity="end"
-        android:orientation="vertical"
         android:clickable="true"
         android:background="#fff"
-        android:elevation="5dp">
-
-        <!-- Actions -->
+        android:elevation="5dp"
+        android:layout_gravity="end">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center">
+            android:orientation="vertical">
+
+            <!-- Actions -->
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                style="?android:buttonBarStyle">
+                android:orientation="vertical"
+                android:gravity="center">
 
-                <Button
-                    android:id="@+id/actionDownload"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_file_download_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/download_document"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
+                    android:orientation="horizontal"
+                    style="?android:buttonBarStyle">
 
-                <Button
-                    android:id="@+id/actionExportPdf"
+                    <Button
+                        android:id="@+id/actionDownload"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_file_download_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/download_document"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="8dp"/>
+
+                    <Button
+                        android:id="@+id/actionExportPdf"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_description_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/export_pdf"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="8dp"/>
+
+                    <Button
+                        android:id="@+id/actionAuditLog"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_assignment_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/activity"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="8dp"/>
+
+                </LinearLayout>
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_description_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/export_pdf"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
+                    android:orientation="horizontal"
+                    style="?android:buttonBarStyle">
 
-                <Button
-                    android:id="@+id/actionAuditLog"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_assignment_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/activity"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
+                    <Button
+                        android:id="@+id/actionEditDocument"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_create_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/edit_document"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
+                    <Button
+                        android:id="@+id/actionUploadFile"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/upload_file"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
+                    <Button
+                        android:id="@+id/actionSharing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_share_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/share"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
+                    <Button
+                        android:id="@+id/actionDelete"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_delete_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/delete_document"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
+                </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginLeft="12dp"
+                android:background="#eee"/>
+
+            <!-- Document metadata -->
+
+            <RelativeLayout
+                android:id="@+id/detailLayout"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                style="?android:buttonBarStyle">
+                android:padding="12dp">
 
-                <Button
-                    android:id="@+id/actionEditDocument"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_create_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/edit_document"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="0dp"/>
+                <TextView
+                    android:id="@+id/createdDateLabel"
+                    android:layout_width="100dp"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/created_date"/>
 
-                <Button
-                    android:id="@+id/actionUploadFile"
+                <TextView
+                    android:id="@+id/createdDateTextView"
+                    android:layout_toRightOf="@id/createdDateLabel"
+                    android:layout_toEndOf="@id/createdDateLabel"
+                    android:layout_toLeftOf="@id/sharedImageView"
+                    android:layout_toStartOf="@id/sharedImageView"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/upload_file"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="0dp"/>
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_alignParentTop="true"
+                    android:fontFamily="sans-serif-light"/>
 
-                <Button
-                    android:id="@+id/actionSharing"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_share_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/share"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="0dp"/>
+                <TextView
+                    android:id="@+id/creatorLabel"
+                    android:layout_width="100dp"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_below="@+id/createdDateLabel"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/creator"/>
 
-                <Button
-                    android:id="@+id/actionDelete"
+                <TextView
+                    android:id="@+id/creatorTextView"
+                    android:layout_toRightOf="@id/creatorLabel"
+                    android:layout_toEndOf="@id/creatorLabel"
                     android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_below="@+id/createdDateTextView"
+                    android:fontFamily="sans-serif-light"/>
+
+                <TextView
+                    android:id="@+id/tagTextView"
+                    android:layout_marginTop="8dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_delete_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/delete_document"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="0dp"/>
+                    android:layout_below="@id/creatorLabel"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:maxLines="1"
+                    android:fontFamily="sans-serif-light"/>
+
+                <TextView
+                    android:id="@+id/descriptionTextView"
+                    android:layout_marginTop="12dp"
+                    android:layout_below="@id/tagTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-light"/>
+
+                <ImageView
+                    android:contentDescription="@string/shared"
+                    android:id="@+id/sharedImageView"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_folder_shared_grey600_24dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_toLeftOf="@+id/languageImageView"
+                    android:layout_toStartOf="@+id/languageImageView"/>
+
+                <ImageView
+                    android:contentDescription="@string/language"
+                    android:id="@+id/languageImageView"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"/>
+
+            </RelativeLayout>
+
+            <!-- Additional dublincore metadata -->
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:paddingBottom="12dp">
+
+                <!-- Subject -->
+
+                <LinearLayout
+                    android:id="@+id/subjectLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/subject"/>
+
+                    <TextView
+                        android:id="@+id/subjectTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Identifier -->
+
+                <LinearLayout
+                    android:id="@+id/identifierLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/identifier"/>
+
+                    <TextView
+                        android:id="@+id/identifierTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Publisher -->
+
+                <LinearLayout
+                    android:id="@+id/publisherLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/publisher"/>
+
+                    <TextView
+                        android:id="@+id/publisherTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Format -->
+
+                <LinearLayout
+                    android:id="@+id/formatLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/format"/>
+
+                    <TextView
+                        android:id="@+id/formatTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Source -->
+
+                <LinearLayout
+                    android:id="@+id/sourceLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/source"/>
+
+                    <TextView
+                        android:id="@+id/sourceTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Type -->
+
+                <LinearLayout
+                    android:id="@+id/typeLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/type"/>
+
+                    <TextView
+                        android:id="@+id/typeTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Coverage -->
+
+                <LinearLayout
+                    android:id="@+id/coverageLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/coverage"/>
+
+                    <TextView
+                        android:id="@+id/coverageTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Rights -->
+
+                <LinearLayout
+                    android:id="@+id/rightsLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/rights"/>
+
+                    <TextView
+                        android:id="@+id/rightsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Contributors -->
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/contributors"/>
+
+                    <TextView
+                        android:id="@+id/contributorsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Relations -->
+
+                <LinearLayout
+                    android:id="@+id/relationsLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="2dp">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/relations"/>
+
+                    <TextView
+                        android:id="@+id/relationsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginLeft="12dp"
+                android:background="#eee"/>
+
+            <!-- ACLs -->
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:textColor="#de000000"
+                android:text="@string/who_can_access"
+                android:layout_margin="12dp"/>
+
+            <com.sismics.docs.ui.view.NonScrollListView
+                android:id="@+id/aclListView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent"
+                android:dividerHeight="0dp"/>
+
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginRight="12dp"
-            android:layout_marginLeft="12dp"
-            android:background="#eee"/>
-
-        <!-- Document metadata -->
-
-        <RelativeLayout
-            android:id="@+id/detailLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp">
-
-            <TextView
-                android:id="@+id/createdDateLabel"
-                android:layout_width="100dp"
-                android:layout_height="24dp"
-                android:gravity="center_vertical"
-                android:layout_alignParentTop="true"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/created_date"/>
-
-            <TextView
-                android:id="@+id/createdDateTextView"
-                android:layout_toRightOf="@id/createdDateLabel"
-                android:layout_toEndOf="@id/createdDateLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:gravity="center_vertical"
-                android:layout_alignParentTop="true"
-                android:fontFamily="sans-serif-light"/>
-
-            <TextView
-                android:id="@+id/creatorLabel"
-                android:layout_width="100dp"
-                android:layout_height="24dp"
-                android:gravity="center_vertical"
-                android:layout_below="@+id/createdDateLabel"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/creator"/>
-
-            <TextView
-                android:id="@+id/creatorTextView"
-                android:layout_toRightOf="@id/creatorLabel"
-                android:layout_toEndOf="@id/creatorLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:gravity="center_vertical"
-                android:layout_below="@+id/createdDateTextView"
-                android:fontFamily="sans-serif-light"/>
-
-            <TextView
-                android:id="@+id/tagTextView"
-                android:layout_marginTop="8dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/creatorLabel"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:maxLines="1"
-                android:fontFamily="sans-serif-light"/>
-
-            <TextView
-                android:id="@+id/descriptionTextView"
-                android:layout_marginTop="12dp"
-                android:layout_below="@id/tagTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-light"/>
-
-            <ImageView
-                android:id="@+id/sharedImageView"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_folder_shared_grey600_24dp"
-                android:layout_alignParentTop="true"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toLeftOf="@+id/languageImageView"
-                android:layout_toStartOf="@+id/languageImageView"/>
-
-            <ImageView
-                android:id="@+id/languageImageView"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentTop="true"/>
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginRight="12dp"
-            android:layout_marginLeft="12dp"
-            android:background="#eee"/>
-
-        <!-- ACLs -->
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:textColor="#de000000"
-            android:text="@string/who_can_access"
-            android:layout_margin="12dp"/>
-
-        <ListView
-            android:id="@+id/aclListView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:choiceMode="singleChoice"
-            android:divider="@android:color/transparent"
-            android:dividerHeight="0dp"/>
-
-    </LinearLayout>
+    </ScrollView>
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/docs-android/app/src/main/res/values/strings.xml b/docs-android/app/src/main/res/values/strings.xml
index d8f971c6..87e56123 100644
--- a/docs-android/app/src/main/res/values/strings.xml
+++ b/docs-android/app/src/main/res/values/strings.xml
@@ -132,5 +132,17 @@
     <string name="storage_quota">Storage quota</string>
     <string name="storage_display">%1$d/%2$d MB</string>
     <string name="validation_code">Validation code</string>
+    <string name="shared">Shared</string>
+    <string name="language">Language</string>
+    <string name="coverage">Coverage</string>
+    <string name="type">Type</string>
+    <string name="source">Source</string>
+    <string name="format">Format</string>
+    <string name="publisher">Publisher</string>
+    <string name="identifier">Identifier</string>
+    <string name="subject">Subject</string>
+    <string name="rights">Rights</string>
+    <string name="contributors">Contributors</string>
+    <string name="relations">Relations</string>
 
 </resources>