diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt
index de901d622..3acd7eaf8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt
@@ -31,8 +31,8 @@ class TextAvatarDrawable(
   }
 
   override fun draw(canvas: Canvas) {
-    val textSize = Avatars.getTextSizeForLength(context, avatar.text, size * 0.8f, size * 0.45f)
     val width = bounds.width()
+    val textSize = Avatars.getTextSizeForLength(context, avatar.text, width * 0.8f, width * 0.45f)
     val candidates = EmojiProvider.getCandidates(avatar.text)
 
     textPaint.textSize = textSize
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
index 1ccdfdbd5..660227b23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
@@ -26,7 +26,10 @@ class AvatarView @JvmOverloads constructor(
     isClickable = false
   }
 
-  private val avatar: AvatarImageView = findViewById(R.id.avatar_image_view)
+  private val avatar: AvatarImageView = findViewById<AvatarImageView>(R.id.avatar_image_view).apply {
+    initialize(context, attrs)
+  }
+
   private val storyRing: View = findViewById(R.id.avatar_story_ring)
 
   private fun showStoryRing(hasUnreadStory: Boolean) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index dde875e7e..f2878d651 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -95,7 +95,7 @@ public final class AvatarImageView extends AppCompatImageView {
     initialize(context, attrs);
   }
 
-  private void initialize(@NonNull Context context, @Nullable AttributeSet attrs) {
+  public void initialize(@NonNull Context context, @Nullable AttributeSet attrs) {
     setScaleType(ScaleType.CENTER_CROP);
 
     if (attrs != null) {