diff --git a/lint.xml b/lint.xml
index 1261b667e7..580308e46a 100644
--- a/lint.xml
+++ b/lint.xml
@@ -11,4 +11,6 @@
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="ImpliedQuantity" severity="warning" />
 
+    <issue id="CanvasSize" severity="error" />
+
 </lint>
diff --git a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
index 1b59f667cb..1364017f48 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
@@ -47,13 +47,14 @@ public class AsciiEmojiView extends View {
     float overflow = paint.measureText(emoji) / (getWidth() - getPaddingLeft() - getPaddingRight());
     if (overflow > 1f) {
       paint.setTextSize(targetFontSize / overflow);
-      yPos = (int) ((canvas.getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
+      yPos = (int) ((getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
     }
     canvas.drawText(emoji, xPos, yPos, paint);
   }
 
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    //noinspection SuspiciousNameCombination
     super.onMeasure(widthMeasureSpec, widthMeasureSpec);
   }
 }