diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
index 735eda80f..9228e5845 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
@@ -92,6 +92,8 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
     private static final int LOCAL_MESSAGE_LOADER_ID = 1;
     private static final int DECODE_MESSAGE_LOADER_ID = 2;
 
+    private static final int INVALID_OPENPGP_RESULT_CODE = -1;
+
 
     public static MessageViewFragment newInstance(MessageReference reference) {
         MessageViewFragment fragment = new MessageViewFragment();
@@ -400,50 +402,52 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
     }
 
     private void onDecryptionConverge (DecryptedBodyPart decryptedPart) {
-
         try {
-
             if (currentDecryptingResult == null) {
-                Log.e(K9.LOG_TAG, "internal error, we should have a result here!");
+                Log.e(K9.LOG_TAG, "Internal error: we should have a result here!");
                 return;
             }
 
-            int resultCode = currentDecryptingResult.getIntExtra(OpenPgpApi.RESULT_CODE, -1);
-            Log.d(K9.LOG_TAG, "result: " + resultCode);
+            int resultCode = currentDecryptingResult.getIntExtra(OpenPgpApi.RESULT_CODE, INVALID_OPENPGP_RESULT_CODE);
+            if (K9.DEBUG) {
+                Log.d(K9.LOG_TAG, "OpenPGP API decryptVerify result code: " + resultCode);
+            }
 
             switch (resultCode) {
-                case -1:
-                    Log.e(K9.LOG_TAG, "internal error: no result code!");
-                    return;
-
+                case INVALID_OPENPGP_RESULT_CODE: {
+                    Log.e(K9.LOG_TAG, "Internal error: no result code!");
+                    break;
+                }
                 case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: {
                     PendingIntent pendingIntent = currentDecryptingResult.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
                     if (pendingIntent == null) {
                         throw new AssertionError("Expecting PendingIntent on USER_INTERACTION_REQUIRED!");
                     }
+
                     try {
                         getActivity().startIntentSenderForResult(pendingIntent.getIntentSender(),
                                 MessageList.REQUEST_CODE_CRYPTO, null, 0, 0, 0);
                     } catch (SendIntentException e) {
-                        Log.e(K9.LOG_TAG, "internal error on starting pendingintent!", e);
+                        Log.e(K9.LOG_TAG, "Internal error on starting pendingintent!", e);
                     }
-                    return;
+                    break;
                 }
-
                 case OpenPgpApi.RESULT_CODE_ERROR: {
-                    Log.e(K9.LOG_TAG, "error msg: " + currentDecryptingResult.getStringExtra(OpenPgpApi.RESULT_ERROR));
+                    if (K9.DEBUG) {
+                        String errorMessage = currentDecryptingResult.getStringExtra(OpenPgpApi.RESULT_ERROR);
+                        Log.w(K9.LOG_TAG, "OpenPGP API error: " + errorMessage);
+                    }
                     onDecryptionFailed();
-                    return;
+                    break;
                 }
-
                 case OpenPgpApi.RESULT_CODE_SUCCESS: {
                     onDecryptionSuccess(decryptedPart);
+                    break;
                 }
             }
         } finally {
             currentDecryptingResult = null;
         }
-
     }
 
     public void handleCryptoResult(int resultCode, Intent data) {