diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/src/com/fsck/k9/mail/internet/DecoderUtil.java
index e1690f6f1..7590c45a7 100644
--- a/src/com/fsck/k9/mail/internet/DecoderUtil.java
+++ b/src/com/fsck/k9/mail/internet/DecoderUtil.java
@@ -84,7 +84,7 @@ public class DecoderUtil
         byte[] bytes;
         try
         {
-            bytes = encodedWord.getBytes("US-ASCII");
+            bytes = sb.toString().getBytes("US-ASCII");
         }
         catch (UnsupportedEncodingException e)
         {
@@ -213,7 +213,7 @@ public class DecoderUtil
 
         if (encoding.equalsIgnoreCase("Q"))
         {
-            return DecoderUtil.decodeQ(encodedText, charset);
+            return decodeQ(encodedText, charset);
         }
         else if (encoding.equalsIgnoreCase("B"))
         {