diff --git a/src/com/fsck/k9/R.java b/src/com/fsck/k9/R.java
index 4cad8e79a..2f543cc9d 100644
--- a/src/com/fsck/k9/R.java
+++ b/src/com/fsck/k9/R.java
@@ -92,115 +92,112 @@ public final class R {
     }
     public static final class id {
         public static final int account_always_bcc=0x7f0a000b;
-        public static final int account_check_frequency=0x7f0a001a;
+        public static final int account_check_frequency=0x7f0a0018;
         public static final int account_default=0x7f0a0005;
-        public static final int account_delete_policy=0x7f0a0015;
-        public static final int account_delete_policy_label=0x7f0a0014;
-        public static final int account_description=0x7f0a0018;
+        public static final int account_delete_policy=0x7f0a0013;
+        public static final int account_delete_policy_label=0x7f0a0012;
+        public static final int account_description=0x7f0a0016;
         public static final int account_email=0x7f0a0002;
-        public static final int account_is_default=0x7f0a000e;
         public static final int account_name=0x7f0a000a;
-        public static final int account_notify=0x7f0a001b;
+        public static final int account_notify=0x7f0a0019;
         public static final int account_password=0x7f0a0003;
-        public static final int account_port=0x7f0a0012;
-        public static final int account_require_login=0x7f0a001c;
-        public static final int account_require_login_settings=0x7f0a001d;
-        public static final int account_security_type=0x7f0a0013;
-        public static final int account_server=0x7f0a0011;
-        public static final int account_server_label=0x7f0a0010;
-        public static final int account_settings=0x7f0a0050;
+        public static final int account_port=0x7f0a0010;
+        public static final int account_require_login=0x7f0a001a;
+        public static final int account_require_login_settings=0x7f0a001b;
+        public static final int account_security_type=0x7f0a0011;
+        public static final int account_server=0x7f0a000f;
+        public static final int account_server_label=0x7f0a000e;
+        public static final int account_settings=0x7f0a004e;
         public static final int account_signature=0x7f0a000c;
-        public static final int account_username=0x7f0a000f;
-        public static final int accounts=0x7f0a004f;
-        public static final int add_attachment=0x7f0a0055;
-        public static final int add_cc_bcc=0x7f0a0051;
-        public static final int add_new_account=0x7f0a001f;
-        public static final int attachment=0x7f0a003f;
-        public static final int attachment_delete=0x7f0a0035;
-        public static final int attachment_icon=0x7f0a003b;
-        public static final int attachment_info=0x7f0a003c;
-        public static final int attachment_name=0x7f0a0036;
-        public static final int attachments=0x7f0a0030;
-        public static final int bcc=0x7f0a002f;
+        public static final int account_username=0x7f0a000d;
+        public static final int accounts=0x7f0a004d;
+        public static final int add_attachment=0x7f0a0053;
+        public static final int add_cc_bcc=0x7f0a004f;
+        public static final int add_new_account=0x7f0a001d;
+        public static final int attachment=0x7f0a003d;
+        public static final int attachment_delete=0x7f0a0033;
+        public static final int attachment_icon=0x7f0a0039;
+        public static final int attachment_info=0x7f0a003a;
+        public static final int attachment_name=0x7f0a0034;
+        public static final int attachments=0x7f0a002e;
+        public static final int bcc=0x7f0a002d;
         public static final int cancel=0x7f0a0009;
-        public static final int cc=0x7f0a002e;
-        public static final int check_mail=0x7f0a0049;
-        public static final int chip=0x7f0a0026;
-        public static final int compose=0x7f0a004a;
-        public static final int date=0x7f0a0028;
-        public static final int debug_logging=0x7f0a0024;
-        public static final int delete=0x7f0a003a;
-        public static final int delete_account=0x7f0a0048;
-        public static final int description=0x7f0a0020;
-        public static final int discard=0x7f0a0054;
-        public static final int done=0x7f0a0019;
-        public static final int download=0x7f0a003d;
-        public static final int dump_settings=0x7f0a004b;
-        public static final int edit_account=0x7f0a0047;
-        public static final int email=0x7f0a0021;
-        public static final int empty=0x7f0a001e;
-        public static final int feedy=0x7f0a000d;
-        public static final int folder_name=0x7f0a002b;
-        public static final int folder_status=0x7f0a002c;
-        public static final int forward=0x7f0a004c;
-        public static final int from=0x7f0a0027;
+        public static final int cc=0x7f0a002c;
+        public static final int check_mail=0x7f0a0047;
+        public static final int chip=0x7f0a0024;
+        public static final int compose=0x7f0a0048;
+        public static final int date=0x7f0a0026;
+        public static final int debug_logging=0x7f0a0022;
+        public static final int delete=0x7f0a0038;
+        public static final int delete_account=0x7f0a0046;
+        public static final int description=0x7f0a001e;
+        public static final int discard=0x7f0a0052;
+        public static final int done=0x7f0a0017;
+        public static final int download=0x7f0a003b;
+        public static final int dump_settings=0x7f0a0049;
+        public static final int edit_account=0x7f0a0045;
+        public static final int email=0x7f0a001f;
+        public static final int empty=0x7f0a001c;
+        public static final int folder_name=0x7f0a0029;
+        public static final int folder_status=0x7f0a002a;
+        public static final int forward=0x7f0a004a;
+        public static final int from=0x7f0a0025;
         public static final int imap=0x7f0a0001;
-        public static final int imap_path_prefix=0x7f0a0017;
-        public static final int imap_path_prefix_section=0x7f0a0016;
-        public static final int main_text=0x7f0a002a;
+        public static final int imap_path_prefix=0x7f0a0015;
+        public static final int imap_path_prefix_section=0x7f0a0014;
+        public static final int main_text=0x7f0a0028;
         public static final int manual_setup=0x7f0a0006;
-        public static final int mark_as_read=0x7f0a004d;
-        public static final int mark_as_unread=0x7f0a0056;
+        public static final int mark_as_read=0x7f0a004b;
+        public static final int mark_as_unread=0x7f0a0054;
         public static final int message=0x7f0a0007;
-        public static final int message_content=0x7f0a0031;
-        public static final int new_message_count=0x7f0a0022;
+        public static final int message_content=0x7f0a002f;
+        public static final int new_message_count=0x7f0a0020;
         public static final int next=0x7f0a0004;
-        public static final int open=0x7f0a0046;
+        public static final int open=0x7f0a0044;
         public static final int pop=0x7f0a0000;
-        public static final int previous=0x7f0a0037;
+        public static final int previous=0x7f0a0035;
         public static final int progress=0x7f0a0008;
-        public static final int quoted_text=0x7f0a0034;
-        public static final int quoted_text_bar=0x7f0a0032;
-        public static final int quoted_text_delete=0x7f0a0033;
-        public static final int refresh=0x7f0a004e;
-        public static final int reply=0x7f0a0038;
-        public static final int reply_all=0x7f0a0039;
-        public static final int save=0x7f0a0053;
-        public static final int send=0x7f0a0052;
-        public static final int sensitive_logging=0x7f0a0025;
-        public static final int show_pictures=0x7f0a0043;
-        public static final int show_pictures_section=0x7f0a0042;
-        public static final int subject=0x7f0a0029;
-        public static final int text1=0x7f0a0044;
-        public static final int text2=0x7f0a0045;
-        public static final int to=0x7f0a002d;
-        public static final int to_container=0x7f0a0040;
-        public static final int to_label=0x7f0a0041;
-        public static final int version=0x7f0a0023;
-        public static final int view=0x7f0a003e;
+        public static final int quoted_text=0x7f0a0032;
+        public static final int quoted_text_bar=0x7f0a0030;
+        public static final int quoted_text_delete=0x7f0a0031;
+        public static final int refresh=0x7f0a004c;
+        public static final int reply=0x7f0a0036;
+        public static final int reply_all=0x7f0a0037;
+        public static final int save=0x7f0a0051;
+        public static final int send=0x7f0a0050;
+        public static final int sensitive_logging=0x7f0a0023;
+        public static final int show_pictures=0x7f0a0041;
+        public static final int show_pictures_section=0x7f0a0040;
+        public static final int subject=0x7f0a0027;
+        public static final int text1=0x7f0a0042;
+        public static final int text2=0x7f0a0043;
+        public static final int to=0x7f0a002b;
+        public static final int to_container=0x7f0a003e;
+        public static final int to_label=0x7f0a003f;
+        public static final int version=0x7f0a0021;
+        public static final int view=0x7f0a003c;
     }
     public static final class layout {
         public static final int account_setup_account_type=0x7f030000;
         public static final int account_setup_basics=0x7f030001;
         public static final int account_setup_check_settings=0x7f030002;
         public static final int account_setup_composition=0x7f030003;
-        public static final int account_setup_compositiontest=0x7f030004;
-        public static final int account_setup_incoming=0x7f030005;
-        public static final int account_setup_names=0x7f030006;
-        public static final int account_setup_options=0x7f030007;
-        public static final int account_setup_outgoing=0x7f030008;
-        public static final int accounts=0x7f030009;
-        public static final int accounts_item=0x7f03000a;
-        public static final int debug=0x7f03000b;
-        public static final int folder_message_list_child=0x7f03000c;
-        public static final int folder_message_list_child_footer=0x7f03000d;
-        public static final int folder_message_list_group=0x7f03000e;
-        public static final int message_compose=0x7f03000f;
-        public static final int message_compose_attachment=0x7f030010;
-        public static final int message_view=0x7f030011;
-        public static final int message_view_attachment=0x7f030012;
-        public static final int message_view_header=0x7f030013;
-        public static final int recipient_dropdown_item=0x7f030014;
+        public static final int account_setup_incoming=0x7f030004;
+        public static final int account_setup_names=0x7f030005;
+        public static final int account_setup_options=0x7f030006;
+        public static final int account_setup_outgoing=0x7f030007;
+        public static final int accounts=0x7f030008;
+        public static final int accounts_item=0x7f030009;
+        public static final int debug=0x7f03000a;
+        public static final int folder_message_list_child=0x7f03000b;
+        public static final int folder_message_list_child_footer=0x7f03000c;
+        public static final int folder_message_list_group=0x7f03000d;
+        public static final int message_compose=0x7f03000e;
+        public static final int message_compose_attachment=0x7f03000f;
+        public static final int message_view=0x7f030010;
+        public static final int message_view_attachment=0x7f030011;
+        public static final int message_view_header=0x7f030012;
+        public static final int recipient_dropdown_item=0x7f030013;
     }
     public static final class menu {
         public static final int accounts_context=0x7f090000;