diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index df649b261..d64293c7c 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -308,7 +308,8 @@
     </receiver>    
             
     <!-- actfm -->
-    <activity android:name="com.todoroo.astrid.actfm.ActFmLoginActivity" />
+    <activity android:name="com.todoroo.astrid.actfm.ActFmLoginActivity"
+              android:configChanges="keyboardHidden|orientation"/>
     <activity android:name="com.todoroo.astrid.actfm.OAuthLoginActivity" />
     <activity android:name="com.todoroo.astrid.actfm.ActFmPreferences"
               android:theme="@android:style/Theme"
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 56146ec33..724d8f21e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -35,6 +35,7 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
@@ -153,6 +154,16 @@ public class ActFmLoginActivity extends Activity implements AuthListener {
         setResult(RESULT_CANCELED);
     }
 
+
+    /* (non-Javadoc)
+     * @see android.app.Activity#onConfigurationChanged(android.content.res.Configuration)
+     */
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        setContentView(getContentViewResource());
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index c94b0ff29..e2186d569 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -478,7 +478,8 @@ public class TagViewActivity extends TaskListActivity {
 
     @Override
     protected Task quickAddTask(String title, boolean selectNewTask) {
-        if(tagData.getValue(TagData.NAME).length() == 0) {
+        if(!tagData.containsNonNullValue(TagData.NAME) ||
+                tagData.getValue(TagData.NAME).length() == 0) {
             DialogUtilities.okDialog(this, getString(R.string.tag_no_title_error), null);
             return null;
         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
index 26e35264e..3f3780cfd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -54,8 +54,12 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
             }
         } else if(r.getString(R.string.p_rmd_time).equals(preference.getKey())) {
             int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_rmd_time_values), (String)value);
-            String setting = r.getStringArray(R.array.EPr_rmd_time)[index];
-            preference.setSummary(r.getString(R.string.rmd_EPr_rmd_time_desc, setting));
+            if (index != -1 && index < r.getStringArray(R.array.EPr_rmd_time).length) {
+                // FIXME this does not fix the underlying cause of the ArrayIndexOutofBoundsException
+                // https://www.crittercism.com/developers/crash-details/e0886dbfcf9e78a21d9f2e2a385c4c13e2f6ad2132ac24a3fa811144
+                String setting = r.getStringArray(R.array.EPr_rmd_time)[index];
+                preference.setSummary(r.getString(R.string.rmd_EPr_rmd_time_desc, setting));
+            }
         } else if(r.getString(R.string.p_rmd_ringtone).equals(preference.getKey())) {
             if(value == null || "content://settings/system/notification_sound".equals(value)) //$NON-NLS-1$
                 preference.setSummary(r.getString(R.string.rmd_EPr_ringtone_desc_default));
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index e93bcffe5..3fc974c3e 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -1585,7 +1585,7 @@ Achtung: diese Aufgaben sind unwiederbringlich verloren, wenn Sie kein Backup ge
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1624,7 +1624,7 @@ Achtung: diese Aufgaben sind unwiederbringlich verloren, wenn Sie kein Backup ge
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1652,7 +1652,7 @@ Achtung: diese Aufgaben sind unwiederbringlich verloren, wenn Sie kein Backup ge
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 3e6ff70f4..d42bdfae1 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -1586,7 +1586,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1625,7 +1625,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1653,7 +1653,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 84938ce97..c663bb5f9 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -1661,10 +1661,10 @@ Astrid might not let you know when your tasks are due.\n
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>02:00</item>
+    <item>00:00</item>
+    <item>01:00</item>
     <item>02:00</item>
+    <item>03:00</item>
     <item>04:00</item>
     <item>05:00</item>
     <item>06:00</item>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index cdb5b3a5b..58667c831 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -1623,7 +1623,7 @@
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 3a7160307..0b7677891 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -1575,7 +1575,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1614,7 +1614,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>
@@ -1642,7 +1642,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>24:00</item>
+    <item>00:00</item>
     <item>01:00</item>
     <item>02:00</item>
     <item>03:00</item>