diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e4d111d..854a7d80c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * hide contact email addresses in search results
 * disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
+* don't enlage email chats avatar placeholder
 
 ## v2.8.0
 
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
index db320e999..30136c6f2 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
@@ -329,7 +329,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
 
     File file = new File(profileImagePath);
 
-    if (file.exists()) {
+    if (chatIsEncrypted && file.exists()) {
       profileImageUri = Uri.fromFile(file);
       String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1);
 
@@ -338,7 +338,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
       intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
       intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar
               MediaPreviewActivity.EDIT_AVATAR_CHAT_ID,
-              (chatIsMultiUser && chatIsEncrypted && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
+              (chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
       );
       startActivity(intent);
     } else if (chatIsMultiUser){