diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 2851ea88a..f220eda1a 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -891,7 +891,7 @@ public class MessageView extends K9Activity implements OnClickListener
         // SINGLE_COLUMN layout was broken on Android < 2.2, so we
         // administratively disable it
         if (
-            ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO)
+            ( Integer.parseInt(Build.VERSION.SDK)  > Build.VERSION_CODES.ECLAIR)
             &&  K9.mobileOptimizedLayout())
         {
             webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 891458fce..e0cfc3da8 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -228,7 +228,7 @@ public class Prefs extends K9PreferenceActivity
         mZoomControlsEnabled.setChecked(K9.zoomControlsEnabled());
 
         mMobileOptimizedLayout = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT);
-        if ( Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO)
+        if (Integer.parseInt(Build.VERSION.SDK)  <= Build.VERSION_CODES.ECLAIR)
         {
             mMobileOptimizedLayout.setEnabled(false);
         }