diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index d52b9d98b..3c9faddbd 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -77,7 +77,7 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
     super.onCreate(icicle);
     addPreferencesFromResource(R.xml.preferences);
         
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ECLAIR) {
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.DONUT) {
       CheckBoxPreference mmsPreference = (CheckBoxPreference)this.findPreference("pref_all_mms");
       mmsPreference.setChecked(false);
       mmsPreference.setEnabled(false);
@@ -133,7 +133,7 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
   }
    
   public static boolean showIcon() {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR;
+    return Build.VERSION.SDK_INT > Build.VERSION_CODES.DONUT;
   }
 
   private void handleIdentitySelection(Intent data) {
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java b/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java
index 06b924904..326c32456 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java
@@ -50,7 +50,7 @@ public abstract class ContactAccessor {
     if (sInstance == null) {
       String className;
 
-      if (Integer.parseInt(Build.VERSION.SDK) < Build.VERSION_CODES.ECLAIR) 
+      if (Integer.parseInt(Build.VERSION.SDK) <= Build.VERSION_CODES.DONUT) 
         className = "ContactAccessorOldApi";
       else 
         className = "ContactAccessorNewApi";
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java b/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
index d06d2d617..d8eaf1065 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
@@ -47,7 +47,7 @@ public class RecipientFactory {
         
     int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
         
-    if (sdkVersion < Build.VERSION_CODES.ECLAIR) className = "OldRecipientProvider";
+    if (sdkVersion <= Build.VERSION_CODES.DONUT) className = "OldRecipientProvider";
     else                                         className = "NewRecipientProvider";
 
     try {
diff --git a/src/org/thoughtcrime/securesms/service/MmsListener.java b/src/org/thoughtcrime/securesms/service/MmsListener.java
index 1aff7d2fc..0dae2827f 100644
--- a/src/org/thoughtcrime/securesms/service/MmsListener.java
+++ b/src/org/thoughtcrime/securesms/service/MmsListener.java
@@ -33,7 +33,7 @@ import android.util.Log;
 public class MmsListener extends BroadcastReceiver {
 
   private boolean isRelevent(Context context, Intent intent) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ECLAIR)
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.DONUT)
       return false;
 		
     if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.ALL_MMS_PERF, true))