diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index a240975eb..913ee7d05 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -539,7 +539,7 @@ public class MessageView extends K9Activity implements OnClickListener
                 label.setSpan(boldSpan, 0, label.length(), 0);
 
                 sb.append(label);
-                sb.append(additionalHeader.value.replaceAll("\\r\\n", ""));
+                sb.append(MimeUtility.unfoldAndDecode(additionalHeader.value));
             }
 
             mAdditionalHeadersView.setText(sb);
diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 4cff61d12..cccb55c40 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -49,6 +49,9 @@ public class LocalStore extends Store implements Serializable
     static
     {
         HEADERS_TO_SAVE.add(K9.K9MAIL_IDENTITY);
+        HEADERS_TO_SAVE.add("To");
+        HEADERS_TO_SAVE.add("Cc");
+        HEADERS_TO_SAVE.add("From");
         HEADERS_TO_SAVE.add("In-Reply-To");
         HEADERS_TO_SAVE.add("References");
         HEADERS_TO_SAVE.add("X-User-Agent");