diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fbfececdd..6692e231f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="15018"
-    android:versionName="4.119" package="com.fsck.k9"
+    android:versionCode="15019"
+    android:versionName="4.120" package="com.fsck.k9"
     >
     <uses-sdk
        android:minSdkVersion="7"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8350288fa..71626f7ea 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -278,7 +278,7 @@ http://k9mail.googlecode.com/.
     <string name="message_view_fetching_attachment_toast">Lade Anhang.</string>
     <string name="message_view_no_viewer">Es wurde kein Anzeigeprogramm für <xliff:g id="mimetype">%s</xliff:g> gefunden.</string>
     <string name="message_view_download_remainder">Gesamte Nachricht herunterladen</string>
-    <!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
+    <string name="message_view_downloading">Herunterladen…</string>
 
     <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
     <string name="message_additional_headers_not_downloaded">Es wurden nicht alle Header heruntergeladen oder gespeichert. Wählen Sie \"Alle Header lokal speichern\" in den Einstellungen für den Posteingangsserver um dies zukünftig zu ermöglichen.</string>
@@ -326,15 +326,15 @@ http://k9mail.googlecode.com/.
     <string name="global_settings_privacy_mode_title">Vertrauliche Benachrichtigung</string>
     <string name="global_settings_privacy_mode_summary">Der Betreff der Nachricht wird nicht in der Benachrichtigungszeile angezeigt</string>
 
-    <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
-    <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
-    <!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
-    <!-- NEW: <string name="global_settings_delete">Delete</string>-->
-    <!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
-    <!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
-    <!-- NEW: <string name="global_settings_move">Move</string>-->
-    <!-- NEW: <string name="global_settings_flag">Flag</string>-->
-    <!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
+    <string name="global_settings_batch_buttons">Gruppenoperationen-Schaltflächen</string>
+    <string name="global_settings_batch_buttons_summary">Zeige folgende Schaltflächen in der Nachrichtenliste an</string>
+    <string name="global_settings_mark_read">Als (un)gelesen markieren</string>
+    <string name="global_settings_delete">Löschen</string>
+    <string name="global_settings_archive">Archivieren</string>
+    <string name="global_settings_archive_disabled_reason">Es wurde kein Archiv-Ordner gefunden.</string>
+    <string name="global_settings_move">Verschieben</string>
+    <string name="global_settings_flag">Als wichtig markieren</string>
+    <string name="global_settings_unselect">Alle deselektieren</string>
 
     <string name="quiet_time">Ruhezeit</string>
     <string name="quiet_time_description">Deaktivere Klingeln, Vibrieren und Leuchten in der Nacht</string>
@@ -766,7 +766,7 @@ http://k9mail.googlecode.com/.
         \"Plus\"-Konto nicht bezahlt. Starten Sie den Webbrowser, um auf
         diese Mailkonten zuzugreifen.</string>
     <string name="provider_note_yahoojp">Wenn Sie für diesen Provider POP3 verwenden möchten, sollten Sie in den "Yahoo! Mail"-Einstellungen POP3 aktivieren.</string>
-    <!-- NEW: <string name="provider_note_auonejp">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on au one mail settings page.</string>-->
+    <string name="provider_note_auonejp">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "AU One"-Einstellungsseite aktivieren.</string>
     <string name="provider_note_naver">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Naver Mail"-Einstellungsseite aktivieren.</string>
     <string name="provider_note_hanmail">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Hanmail(Daum)"-Einstellungsseite aktivieren.</string>
     <string name="provider_note_paran">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Paran"-Einstellungsseite aktivieren.</string>
@@ -1070,7 +1070,7 @@ http://k9mail.googlecode.com/.
     <string name="import_dialog_error_title">Kein Dateimanager gefunden!</string>
     <string name="close">Abbrechen</string>
 
-    <!-- NEW: <string name="webview_empty_message">No text</string>-->
+    <string name="webview_empty_message">Kein Nachrichtentext</string>
 
     <string name="webview_contextmenu_link_view_action">Öffnen</string>
     <string name="webview_contextmenu_link_share_action">Link weitergeben</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2bc47e39f..792efd8dd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -579,7 +579,7 @@ de plus</string>
 
     <string name="account_settings_general_title">Paramètres généraux</string>
     <string name="account_settings_display_prefs_title">Affichage</string>
-    <string name="account_settings_sync">Synchronication de dossiers</string>
+    <string name="account_settings_sync">Synchronisation de dossiers</string>
     <string name="account_settings_folders">Dossiers</string>
     <string name="account_settings_message_lists">Listage de messages</string>
     <string name="account_settings_message_view">Visualisation de messages</string>
diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index e9abb3a1a..55b360cde 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -956,7 +956,7 @@ public class MimeUtility {
         header = header.replaceAll("\r|\n", "");
         String[] parts = header.split(";");
         if (name == null && parts.length > 0) {
-            return parts[0];
+            return parts[0].trim();
         }
         for (String part : parts) {
             if (part.trim().toLowerCase(Locale.US).startsWith(name.toLowerCase(Locale.US))) {
diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java
index e81016df4..5783d1974 100644
--- a/src/com/fsck/k9/view/MessageWebView.java
+++ b/src/com/fsck/k9/view/MessageWebView.java
@@ -146,15 +146,9 @@ public class MessageWebView extends WebView {
         }
     }
 
-    public void wrapSetTitleBar(final View title) {
-        try {
-            Class<?> webViewClass = Class.forName("android.webkit.WebView");
-            Method setEmbeddedTitleBar = webViewClass.getMethod("setEmbeddedTitleBar", View.class);
-            setEmbeddedTitleBar.invoke(this, title);
-        }
-
-        catch (Exception e) {
-            Log.v(K9.LOG_TAG, "failed to find the  setEmbeddedTitleBar method",e);
-        }
+    public void wrapSetTitleBar(final View title) throws Exception {
+        Class<?> webViewClass = Class.forName("android.webkit.WebView");
+        Method setEmbeddedTitleBar = webViewClass.getMethod("setEmbeddedTitleBar", View.class);
+        setEmbeddedTitleBar.invoke(this, title);
     }
 }
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 31df37bc2..09fab78e4 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -8,6 +8,7 @@ import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
@@ -140,7 +141,9 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
         mDownloadRemainder.setVisibility(View.GONE);
         mAttachmentsContainer.setVisibility(View.GONE);
-        if (isScreenReaderActive(activity)) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
+                isScreenReaderActive(activity)) {
+            // Only use the special screen reader mode on pre-ICS devices with active screen reader
             mAccessibleMessageContentView.setVisibility(View.VISIBLE);
             mMessageContentView.setVisibility(View.GONE);
             mScreenReaderEnabled = true;
@@ -156,7 +159,19 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
 
             mTitleBarHeaderContainer = new LinearLayout(activity);
             mTitleBarHeaderContainer.addView(mHeaderContainer);
-            mMessageContentView.wrapSetTitleBar(mTitleBarHeaderContainer);
+            try {
+                mMessageContentView.wrapSetTitleBar(mTitleBarHeaderContainer);
+            } catch (Exception e) {
+                // If wrapSetTitleBar() fails we put the header back. This isn't a very good
+                // fall-back but better than not displaying the message header at all.
+
+                // FIXME: Get rid of the setEmbeddedTitleBar-method and come up with something that
+                //        feels just like it but doesn't use undocumented methods.
+
+                mTitleBarHeaderContainer.removeView(mHeaderContainer);
+                mHeaderPlaceHolder.addView(mHeaderContainer);
+                mTitleBarHeaderContainer = null;
+            }
         }
 
         mShowHiddenAttachments.setOnClickListener(this);
diff --git a/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
index 8bf122395..900daec60 100644
--- a/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
+++ b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
@@ -35,5 +35,8 @@ public class MimeUtilityTest extends AndroidTestCase {
 
         result = MimeUtility.getHeaderParameter("name=\"\"", "name");
         assertEquals("", result);
+
+        result = MimeUtility.getHeaderParameter("text/html ; charset=\"windows-1251\"", null);
+        assertEquals("text/html", result);
     }
 }