diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cda2b21e..535a4708 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,9 +20,13 @@
 # hide the original source file name.
 -renamesourcefileattribute SourceFile
 
+#App
 -keep class eu.faircode.email.**
 -keepnames class eu.faircode.email.** { *; }
 
+#Support library
+-keep class android.support.v7.app.AppCompatViewInflater{ <init>(...); }
+
 #JavaMail
 -dontshrink
 -keep class javax.** {*;}
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 9ada05ae..f83ad895 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -242,7 +242,7 @@ public class FragmentAccount extends Fragment {
                                 }
                             }
                         }
-                        if (!drafts)
+                        if (account.primary && !drafts)
                             throw new MessagingException(getContext().getString(R.string.title_no_drafts));
                     } finally {
                         if (istore != null)