diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index bc3ff68262..2697d9e9cf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -157,7 +157,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             ivAvatar.setVisibility(photo ? View.VISIBLE : View.GONE);
 
             vwColor.setBackgroundColor(message.accountColor == null ? Color.TRANSPARENT : message.accountColor);
-            vwColor.setVisibility(viewType == ViewType.UNIFIED ? View.VISIBLE : View.GONE);
+            vwColor.setVisibility(viewType == ViewType.UNIFIED && message.accountColor != null ? View.VISIBLE : View.GONE);
 
             if (viewType == ViewType.THREAD)
                 ivFlagged.setVisibility(message.unflagged == 1 ? View.GONE : View.VISIBLE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 1543132df4..9e5c73e7e4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -603,7 +603,7 @@ public class FragmentAccount extends FragmentEx {
                         int auth_type = args.getInt("auth_type");
 
                         String name = args.getString("name");
-                        int color = args.getInt("color");
+                        Integer color = args.getInt("color");
                         String signature = args.getString("signature");
 
                         boolean synchronize = args.getBoolean("synchronize");
@@ -628,6 +628,8 @@ public class FragmentAccount extends FragmentEx {
                             interval = "12";
                         if (synchronize && drafts == null)
                             throw new Throwable(getContext().getString(R.string.title_no_drafts));
+                        if (Color.TRANSPARENT == color)
+                            color = null;
 
                         // Check IMAP server
                         if (synchronize) {
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 664bb765c9..259a08e804 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -69,7 +69,7 @@
             android:id="@+id/tvTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
+            android:layout_marginEnd="6dp"
             android:maxLines="1"
             android:text="Time"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -126,7 +126,7 @@
             android:id="@+id/ivThread"
             android:layout_width="15dp"
             android:layout_height="15dp"
-            android:layout_marginEnd="12dp"
+            android:layout_marginEnd="6dp"
             android:src="@drawable/baseline_message_24"
             app:layout_constraintBottom_toBottomOf="@id/tvSubject"
             app:layout_constraintEnd_toEndOf="parent"
@@ -136,7 +136,7 @@
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
+            android:layout_marginEnd="6dp"
             android:layout_marginStart="6dp"
             android:text="error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"