diff --git a/docs-android/app/app.iml b/docs-android/app/app.iml
index 645f6299..46bcd543 100644
--- a/docs-android/app/app.iml
+++ b/docs-android/app/app.iml
@@ -105,6 +105,7 @@
     <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="android-query.0.26.8" level="project" />
+    <orderEntry type="library" exported="" name="tokenautocomplete-1.2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
   </component>
diff --git a/docs-android/app/libs/tokenautocomplete-1.2.1.jar b/docs-android/app/libs/tokenautocomplete-1.2.1.jar
new file mode 100644
index 00000000..61424706
Binary files /dev/null and b/docs-android/app/libs/tokenautocomplete-1.2.1.jar differ
diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
index 1ebb1771..89aba390 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
@@ -36,8 +36,7 @@ public class DocumentEditActivity extends ActionBarActivity {
 
         MultiAutoCompleteTextView tagsEditText = (MultiAutoCompleteTextView) findViewById(R.id.tagsEditText);
         tagsEditText.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
-                new String[] { "Caluire", "Appartement", "Banque", "Assurance" }));
-        tagsEditText.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
+                new String[]{"Caluire", "Appartement", "Banque", "Assurance"}));
     }
 
     @Override
diff --git a/docs-android/app/src/main/java/com/sismics/docs/ui/view/TagsCompleteTextView.java b/docs-android/app/src/main/java/com/sismics/docs/ui/view/TagsCompleteTextView.java
new file mode 100644
index 00000000..d0a9f8aa
--- /dev/null
+++ b/docs-android/app/src/main/java/com/sismics/docs/ui/view/TagsCompleteTextView.java
@@ -0,0 +1,34 @@
+package com.sismics.docs.ui.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+import com.tokenautocomplete.TokenCompleteTextView;
+
+public class TagsCompleteTextView extends TokenCompleteTextView {
+    public TagsCompleteTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected View getViewForObject(Object object) {
+        String p = (String)object;
+
+        LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+        TextView view = (TextView) inflater.inflate(R.layout.tag_complete_item, (ViewGroup) getParent(), false);
+        view.setText(p);
+
+        return view;
+    }
+
+    @Override
+    protected Object defaultObject(String completionText) {
+        return completionText;
+    }
+}
\ No newline at end of file
diff --git a/docs-android/app/src/main/res/layout/document_edit_activity.xml b/docs-android/app/src/main/res/layout/document_edit_activity.xml
index f4b70933..f9b775be 100644
--- a/docs-android/app/src/main/res/layout/document_edit_activity.xml
+++ b/docs-android/app/src/main/res/layout/document_edit_activity.xml
@@ -58,7 +58,7 @@
         android:layout_margin="8dp"
         android:padding="16dp"/>
 
-    <MultiAutoCompleteTextView
+    <com.sismics.docs.ui.view.TagsCompleteTextView
         android:id="@+id/tagsEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/docs-android/app/src/main/res/layout/tag_complete_item.xml b/docs-android/app/src/main/res/layout/tag_complete_item.xml
new file mode 100644
index 00000000..4101f84b
--- /dev/null
+++ b/docs-android/app/src/main/res/layout/tag_complete_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/edtTxt1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#ccc"
+    android:drawablePadding="2dp"
+    android:padding="8dp"
+    android:shadowColor="#FFFFFF"
+    android:shadowDy="1"
+    android:shadowRadius="0.01"
+    android:textColor="#000000"
+    android:textSize="18sp"
+    android:textStyle="bold" />
\ No newline at end of file