diff --git a/vector/build.gradle b/vector/build.gradle
index 62ff3951af..28d8fe5c1b 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -440,6 +440,10 @@ dependencies {
     implementation 'com.google.zxing:core:3.3.3'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
 
+    // Emoji Keyboard
+    implementation 'com.vanniktech:emoji-material:0.7.0'
+    implementation 'com.vanniktech:emoji-google:0.7.0'
+
     // TESTS
     testImplementation 'junit:junit:4.13'
     testImplementation "org.amshove.kluent:kluent-android:$kluent_version"
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 5be313d719..921e8c0780 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -36,6 +36,8 @@ import com.airbnb.epoxy.EpoxyAsyncUtil
 import com.airbnb.epoxy.EpoxyController
 import com.facebook.stetho.Stetho
 import com.gabrielittner.threetenbp.LazyThreeTen
+import com.vanniktech.emoji.EmojiManager
+import com.vanniktech.emoji.google.GoogleEmojiProvider
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.DaggerVectorComponent
 import im.vector.app.core.di.HasVectorInjector
@@ -184,6 +186,8 @@ class VectorApplication :
             addAction(Intent.ACTION_SCREEN_OFF)
             addAction(Intent.ACTION_SCREEN_ON)
         })
+
+        EmojiManager.install(GoogleEmojiProvider())
     }
 
     private fun enableStrictModeIfNeeded() {