diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml
index 615397bbe..ca890d986 100644
--- a/k9mail/src/main/AndroidManifest.xml
+++ b/k9mail/src/main/AndroidManifest.xml
@@ -65,7 +65,7 @@
         android:name="K9"
         android:allowTaskReparenting="false"
         android:icon="@drawable/icon"
-        android:label="@string/beta_app_name"
+        android:label="@string/app_name"
         android:theme="@style/Theme.K9.Startup">
 
         <meta-data
diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
index 16b7f1af3..0620366d1 100644
--- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -162,7 +162,7 @@ public class MessagingController implements Runnable {
             if (o1 == null || o2 == null || o1.getUid() == null || o2.getUid() == null) {
                 return 0;
             }
-      int id1, id2;
+            int id1, id2;
             try {
                 id1 = Integer.parseInt(o1.getUid());
                 id2 = Integer.parseInt(o2.getUid());