diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 8b2c0fbf18..3b94c079be 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3486,6 +3486,9 @@ public class MessageHelper {
 
     static byte[] decodeWord(String word, String encoding, String charset) throws IOException {
         String e = encoding.trim();
+        if (e.equalsIgnoreCase("B"))
+            while (word.startsWith("="))
+                word = word.substring(1);
         ByteArrayInputStream bis = new ByteArrayInputStream(ASCIIUtility.getBytes(word));
 
         InputStream is;