diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 153a53036a..e9cd6ab097 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -236,8 +236,13 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                                 bm = ImageHelper.getScaledBitmap(is, avatar, null, scaleToPixels);
                                 if (bm == null)
                                     throw new FileNotFoundException(avatar);
-                                return bm;
                             }
+
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                            boolean circular = prefs.getBoolean("circular", true);
+                            bm = ImageHelper.makeCircular(bm, circular ? null : Helper.dp2pixels(context, 3));
+
+                            return bm;
                         }
 
                         @Override