Don't force plain text when PGP/INLINE is not enabled

2016-09-11 03:15:53 +02:00 · 2016-09-11 03:15:53 +02:00 · 4430abaf30
commit 4430abaf30
parent 78d3b011e6
1 changed files with 4 additions and 0 deletions
--- a/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java
@ -370,6 +370,10 @@ public class RecipientPresenter implements PermissionPingCallback {
    }

    public boolean isForceTextMessageFormat() {
+        if (!cryptoEnablePgpInline) {
+            return false;
+        }
+        
        ComposeCryptoStatus cryptoStatus = getCurrentCryptoStatus();
        return cryptoStatus.isEncryptionEnabled() || cryptoStatus.isSigningEnabled();
    }