diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e880fb7c4..2f482bee1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -258,10 +258,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
+<!--         <activity
             android:name="com.fsck.k9.AccessibleEmailContentActivity"
             >
-        </activity>
+        </activity>-->
 
         <receiver android:name="com.fsck.k9.service.BootReceiver"
               android:enabled="true"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index eadbf99aa..861e75a13 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -437,11 +437,11 @@ public class MessageList
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
+        context=this;
         super.onCreate(savedInstanceState);
         mInflater = getLayoutInflater();
         initializeLayout();
         onNewIntent(getIntent());
-        context=this;
     }
 
     @Override
diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java
index 99cbb53aa..0a2923a4b 100644
--- a/src/com/fsck/k9/mail/internet/MimeHeader.java
+++ b/src/com/fsck/k9/mail/internet/MimeHeader.java
@@ -163,5 +163,12 @@ public class MimeHeader
             this.name = name;
             this.value = value;
         }
+
+        public String toString()
+        {
+          StringBuilder sb = new StringBuilder("(");
+           sb.append(name).append('=').append(value).append(')');
+           return sb.toString();
+    	}
     }
 }