diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
index c6be46a1d..d29b79181 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
@@ -146,6 +146,8 @@ public class MessageLoaderHelper {
      * asyncStartOrResumeLoadingMessage in a new instance of this class. */
     @UiThread
     public void onDestroyChangingConfigurations() {
+        cancelAndClearDecodeLoader();
+
         if (messageCryptoHelper != null) {
             messageCryptoHelper.detachCallback();
         }