diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index bb2304e26..e77e728e0 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -234,6 +234,7 @@
                 android:textSize="@{model.isTextEmoji ? @dimen/chat_bubble_emoji_only_text_size : @dimen/chat_bubble_text_size, default=@dimen/chat_bubble_text_size}"
                 android:textColor="?attr/color_main2_800"
                 android:gravity="center_vertical|start"
+                android:includeFontPadding="@{!model.isTextEmoji}"
                 android:visibility="@{model.text.length() > 0 ? View.VISIBLE : View.GONE}"/>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 8fc3a3430..5b6386131 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -206,6 +206,7 @@
                 android:textSize="@{model.isTextEmoji ? @dimen/chat_bubble_emoji_only_text_size : @dimen/chat_bubble_text_size, default=@dimen/chat_bubble_text_size}"
                 android:textColor="?attr/color_main2_800"
                 android:gravity="center_vertical|start"
+                android:includeFontPadding="@{!model.isTextEmoji}"
                 android:visibility="@{model.text.length() > 0 ? View.VISIBLE : View.GONE}"/>
 
             <LinearLayout