diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java
index ccdeba468..eab48dbab 100644
--- a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java
+++ b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java
@@ -55,7 +55,7 @@ public class BinaryTempFileBody implements Body {
         boolean closeStream = false;
         InputStream in = getInputStream();
         if (MimeUtil.isBase64Encoding(mEncoding)) {
-            out = (OutputStream) new Base64OutputStream(out);
+            out = new Base64OutputStream(out);
             closeStream = true;
         } else if (MimeUtil.isQuotedPrintableEncoded(mEncoding)){
             out = new QuotedPrintableOutputStream(out, false);
diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 42c0309d7..f56a088bc 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -4031,7 +4031,7 @@ public class LocalStore extends Store implements Serializable {
             boolean closeStream = false;
             InputStream in = getInputStream();
             if (MimeUtil.isBase64Encoding(mEncoding)) {
-                out = (OutputStream) new Base64OutputStream(out);
+                out = new Base64OutputStream(out);
                 closeStream = true;
             } else if (MimeUtil.isQuotedPrintableEncoded(mEncoding)){
                 out = new QuotedPrintableOutputStream(out, false);