Fix spaces in mime encoded protected subjects

4 years ago · 43b65d1de5
parent 7133ffe990
commit 43b65d1de5
1 changed files with 3 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -2498,9 +2498,11 @@ public class MessageHelper {
                ContentType ct = new ContentType(part.getContentType());
                if ("v1".equals(ct.getParameter("protected-headers"))) {
                    String[] subject = part.getHeader("subject");
-                    if (subject != null && subject.length != 0)
+                    if (subject != null && subject.length != 0) {
+                        subject[0] = subject[0].replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?");
                        parts.protected_subject = decodeMime(subject[0]);
                    }
+                }
            } catch (Throwable ex) {
                Log.e(ex);
            }