diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt
index bef43d8b14..010b362b68 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt
@@ -47,18 +47,26 @@ class AutocompleteEmojiController @Inject constructor(
         if (data.isNullOrEmpty()) {
             return
         }
-        data.forEach { emojiItem ->
-            autocompleteEmojiItem {
-                id(emojiItem.name)
-                emojiItem(emojiItem)
-                emojiTypeFace(emojiTypeface)
-                onClickListener(
-                        object : ReactionClickListener {
-                            override fun onReactionSelected(reaction: String) {
-                                listener?.onItemClick(reaction)
-                            }
-                        }
-                )
+        data
+                .take(MAX)
+                .forEach { emojiItem ->
+                    autocompleteEmojiItem {
+                        id(emojiItem.name)
+                        emojiItem(emojiItem)
+                        emojiTypeFace(emojiTypeface)
+                        onClickListener(
+                                object : ReactionClickListener {
+                                    override fun onReactionSelected(reaction: String) {
+                                        listener?.onItemClick(reaction)
+                                    }
+                                }
+                        )
+                    }
+                }
+
+        if (data.size > MAX) {
+            autocompleteMoreResultItem {
+                id("more_result")
             }
         }
     }
@@ -67,4 +75,8 @@ class AutocompleteEmojiController @Inject constructor(
         super.onDetachedFromRecyclerView(recyclerView)
         fontProvider.removeListener(fontProviderListener)
     }
+
+    companion object {
+        const val MAX = 50
+    }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
new file mode 100644
index 0000000000..844cc96035
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.features.autocomplete.emoji
+
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass(layout = R.layout.item_autocomplete_more_result)
+abstract class AutocompleteMoreResultItem : VectorEpoxyModel<AutocompleteMoreResultItem.Holder>() {
+
+    class Holder : VectorEpoxyHolder()
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt
index 78ddf80a84..609e7e2183 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt
@@ -166,7 +166,7 @@ class AutoCompleter @Inject constructor(
 
     private fun setupEmojis(backgroundDrawable: Drawable, editText: EditText) {
         Autocomplete.on<String>(editText)
-                .with(CharPolicy(':', true))
+                .with(CharPolicy(':', false))
                 .with(autocompleteEmojiPresenter)
                 .with(ELEVATION)
                 .with(backgroundDrawable)
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
new file mode 100644
index 0000000000..d04f515ed0
--- /dev/null
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:padding="8dp"
+    android:text="@string/autocomplete_limited_results"
+    android:textColor="?riotx_text_secondary"
+    android:textSize="12sp" />
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 1502740112..317511b921 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -18,4 +18,6 @@
     <string name="devices_current_device">Current device</string>
     <string name="devices_other_devices">Other devices</string>
 
+    <string name="autocomplete_limited_results">Limited results, please type more letters…</string>
+
 </resources>