diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 48e0daa9db..eafb26f99e 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -274,6 +274,10 @@ public class StyleHelper {
                                     }
                                 });
 
+                        BackgroundColorSpan[] spans = edit.getSpans(start, end, BackgroundColorSpan.class);
+                        if (spans != null && spans.length == 1)
+                            builder.initialColor(spans[0].getBackgroundColor());
+
                         builder.build().show();
 
                         return true;
@@ -327,6 +331,10 @@ public class StyleHelper {
                                     }
                                 });
 
+                        ForegroundColorSpan[] spans = edit.getSpans(start, end, ForegroundColorSpan.class);
+                        if (spans != null && spans.length == 1)
+                            builder.initialColor(spans[0].getForegroundColor());
+
                         builder.build().show();
 
                         return true;