diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/src/com/fsck/k9/activity/MessageInfoHolder.java
index de4a3441c..4eb0e8451 100644
--- a/src/com/fsck/k9/activity/MessageInfoHolder.java
+++ b/src/com/fsck/k9/activity/MessageInfoHolder.java
@@ -7,7 +7,6 @@ import com.fsck.k9.mail.store.LocalStore.LocalMessage;
 
 public class MessageInfoHolder
 {
-    public String subject;
     public String date;
     public Date compareDate;
     public String compareSubject;
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 3c5dd4645..f03060d0f 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -212,11 +212,11 @@ public class MessageList
             // XXX doesn't respect the Comparator contract since it alters the compared object
             if (arg0.compareSubject == null)
             {
-                arg0.compareSubject = Utility.stripSubject(arg0.subject);
+                arg0.compareSubject = Utility.stripSubject(arg0.message.getSubject());
             }
             if (arg1.compareSubject == null)
             {
-                arg1.compareSubject = Utility.stripSubject(arg1.subject);
+                arg1.compareSubject = Utility.stripSubject(arg1.message.getSubject());
             }
             return arg0.compareSubject.compareToIgnoreCase(arg1.compareSubject);
         }
@@ -2034,7 +2034,7 @@ public class MessageList
 
         getMenuInflater().inflate(R.menu.message_list_context, menu);
 
-        menu.setHeaderTitle((CharSequence) message.subject);
+        menu.setHeaderTitle((CharSequence) message.message.getSubject());
 
         if (message.read)
         {
@@ -2761,13 +2761,13 @@ public class MessageList
             holder.chip.getBackground().setAlpha(message.read ? 127 : 255);
             view.getBackground().setAlpha(message.downloaded ? 0 : 127);
 
-            if ((message.subject == null) || message.subject.equals(""))
+            if ((message.message.getSubject() == null) || message.message.getSubject().equals(""))
             {
                 holder.subject.setText(getText(R.string.general_no_subject));
             }
             else
             {
-                holder.subject.setText(message.subject);
+                holder.subject.setText(message.message.getSubject());
             }
 
             if (holder.preview != null)
diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java
index 2ad905bc9..814faba0f 100644
--- a/src/com/fsck/k9/helper/MessageHelper.java
+++ b/src/com/fsck/k9/helper/MessageHelper.java
@@ -118,7 +118,6 @@ public class MessageHelper
                 }
             }
 
-            target.subject = message.getSubject();
 
             target.uid = message.getUid();
 
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index e337a466f..f0bedd0a9 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -149,7 +149,7 @@ public class MessageProvider extends ContentProvider
         @Override
         public String getField(final MessageInfoHolder source)
         {
-            return source.subject;
+            return source.message.getSubject();
         }
     }
     public static class SendDateExtractor implements FieldExtractor<MessageInfoHolder, Long>