reformat code

22 files changed, 135 insertions, 135 deletions

diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index e2b0798ee..e56a9fa07 100644
--- a/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/attach_location"
-        android:title="@string/send_location"/>
+        android:title="@string/send_location" />
 
     <item
         android:id="@+id/attach_record_voice"
-        android:title="@string/attach_record_voice"/>
+        android:title="@string/attach_record_voice" />
 
     <item
         android:id="@+id/attach_take_picture"
-        android:title="@string/attach_take_picture"/>
+        android:title="@string/attach_take_picture" />
 
     <item
         android:id="@+id/attach_choose_picture"
-        android:title="@string/attach_choose_picture"/>
+        android:title="@string/attach_choose_picture" />
 
     <item
         android:id="@+id/attach_choose_video"
-        android:title="@string/attach_choose_video"/>
+        android:title="@string/attach_choose_video" />
 
     <item
         android:id="@+id/attach_choose_file"
-        android:title="@string/choose_file"/>
+        android:title="@string/choose_file" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml
index f3dfadfd0..1a320d59e 100644
--- a/src/main/res/menu/change_presence.xml
+++ b/src/main/res/menu/change_presence.xml
@@ -3,15 +3,15 @@
         android:id="@+id/action_account_details"
         android:title="@string/account_details"
         android:showAsAction="always"
-        android:icon="@drawable/ic_account_box_white_24dp"/>
+        android:icon="@drawable/ic_account_box_white_24dp" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
         android:showAsAction="never"
-        android:title="@string/action_accounts"/>
+        android:title="@string/action_accounts" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index 94b6479be..6c4d82153 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -6,12 +6,12 @@
         android:actionLayout="@layout/actionview_search"
         android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
-        android:title="@string/search"/>
+        android:title="@string/search" />
 
     <item
         android:id="@+id/action_create_contact"
         android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/create_contact"
-        android:visible="false"/>
+        android:visible="false" />
 </menu>
diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml
index fd898580a..6a6eb92d2 100644
--- a/src/main/res/menu/conference_context.xml
+++ b/src/main/res/menu/conference_context.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/context_join_conference"
-        android:title="@string/join_conference"/>
+        android:title="@string/join_conference" />
     <item
         android:id="@+id/context_delete_conference"
-        android:title="@string/delete_bookmark"/>
+        android:title="@string/delete_bookmark" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
index 223c7ece0..1940d176e 100644
--- a/src/main/res/menu/contact_context.xml
+++ b/src/main/res/menu/contact_context.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/context_start_conversation"
-        android:title="@string/start_conversation"/>
+        android:title="@string/start_conversation" />
     <item
         android:id="@+id/context_contact_details"
-        android:title="@string/view_contact_details"/>
+        android:title="@string/view_contact_details" />
     <item
         android:id="@+id/context_contact_block_unblock"
-        android:title="@string/block_contact"/>
+        android:title="@string/block_contact" />
     <item
         android:id="@+id/context_delete_contact"
-        android:title="@string/delete_contact"/>
+        android:title="@string/delete_contact" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 7fba3a4bd..328b46098 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_edit_contact"
         android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:title="@string/action_edit_contact"/>
+        android:title="@string/action_edit_contact" />
 
     <item
         android:id="@+id/action_share"
         android:icon="?attr/icon_share"
         android:showAsAction="always"
         android:orderInCategory="15"
-        android:title="@string/share_uri_with"/>
+        android:title="@string/share_uri_with" />
 
     <item
         android:id="@+id/action_delete_contact"
         android:orderInCategory="10"
         android:showAsAction="never"
-        android:title="@string/action_delete_contact"/>
+        android:title="@string/action_delete_contact" />
 
     <item
         android:id="@+id/action_block"
         android:orderInCategory="72"
         android:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_off_white_24dp"
-        android:title="@string/action_block_contact"/>
+        android:title="@string/action_block_contact" />
 
     <item
         android:id="@+id/action_unblock"
         android:orderInCategory="73"
         android:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_white_24dp"
-        android:title="@string/action_unblock_contact"/>
+        android:title="@string/action_unblock_contact" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 4f0b98a34..22d8a513a 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -1,78 +1,78 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_add"
         android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:title="@string/action_add"/>
+        android:title="@string/action_add" />
     <item
         android:id="@+id/action_security"
         android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         android:showAsAction="always"
-        android:title="@string/action_secure"/>
+        android:title="@string/action_secure" />
     <item
         android:id="@+id/action_attach_file"
         android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         android:showAsAction="always"
-        android:title="@string/attach_file"/>
-<!--    <item
-        android:id="@+id/action_contact_details"
-        android:icon="?attr/icon_group"
-        android:orderInCategory="40"
-        android:showAsAction="never"
-        android:title="@string/action_contact_details"/>
-    <item
-        android:id="@+id/action_muc_details"
-        android:icon="?attr/icon_group"
-        android:orderInCategory="40"
-        android:showAsAction="never"
-        android:title="@string/action_muc_details"/>
--->
+        android:title="@string/attach_file" />
+    <!--    <item
+            android:id="@+id/action_contact_details"
+            android:icon="?attr/icon_group"
+            android:orderInCategory="40"
+            android:showAsAction="never"
+            android:title="@string/action_contact_details"/>
+        <item
+            android:id="@+id/action_muc_details"
+            android:icon="?attr/icon_group"
+            android:orderInCategory="40"
+            android:showAsAction="never"
+            android:title="@string/action_muc_details"/>
+    -->
     <item
         android:id="@+id/action_invite"
         android:orderInCategory="45"
         android:showAsAction="never"
-        android:title="@string/invite_contact"/>
+        android:title="@string/invite_contact" />
     <item
         android:id="@+id/action_clear_history"
         android:orderInCategory="50"
         android:showAsAction="never"
-        android:title="@string/action_clear_history"/>
+        android:title="@string/action_clear_history" />
     <item
         android:id="@+id/action_archive_chat"
         android:orderInCategory="60"
         android:showAsAction="never"
-        android:title="@string/action_end_conversation"/>
+        android:title="@string/action_end_conversation" />
     <item
         android:id="@+id/action_archive_muc"
         android:orderInCategory="60"
         android:showAsAction="never"
-        android:title="@string/action_end_conversation_muc"/>
+        android:title="@string/action_end_conversation_muc" />
     <item
         android:id="@+id/action_mute"
         android:orderInCategory="70"
         android:showAsAction="never"
-        android:title="@string/disable_notifications"/>
+        android:title="@string/disable_notifications" />
 
     <item
         android:id="@+id/action_unmute"
         android:orderInCategory="71"
         android:showAsAction="never"
-        android:title="@string/enable_notifications"/>
+        android:title="@string/enable_notifications" />
 
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
         android:showAsAction="never"
-        android:title="@string/mgmt_account_edit"/>
+        android:title="@string/mgmt_account_edit" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings" />
     <item
         android:id="@+id/action_invite_user"
         android:orderInCategory="100"
@@ -87,6 +87,6 @@
         android:id="@+id/action_check_updates"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/action_check_update"/>
+        android:title="@string/action_check_update" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 5aa2fc04e..fa53c08de 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -4,59 +4,59 @@
         android:id="@+id/action_change_presence"
         android:showAsAction="always"
         android:title="@string/change_presence"
-        android:icon="@drawable/ic_new_releases_white_24dp"/>
+        android:icon="@drawable/ic_new_releases_white_24dp" />
 
     <item
         android:id="@+id/action_show_qr_code"
         android:showAsAction="never"
-        android:title="@string/show_qr_code"/>
+        android:title="@string/show_qr_code" />
 
     <item
         android:id="@+id/action_show_block_list"
         android:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_off_white_24dp"
-        android:title="@string/show_block_list"/>
+        android:title="@string/show_block_list" />
 
     <item
         android:id="@+id/action_renew_certificate"
         android:showAsAction="never"
         android:title="@string/action_renew_certificate"
-        android:visible="false"/>
+        android:visible="false" />
 
     <item
         android:id="@+id/action_server_info_show_more"
         android:checkable="true"
         android:checked="false"
         android:showAsAction="never"
-        android:title="@string/server_info_show_more"/>
+        android:title="@string/server_info_show_more" />
 
     <item
         android:id="@+id/action_mam_prefs"
         android:icon="@drawable/ic_cloud_white_24dp"
         android:showAsAction="always"
-        android:title="@string/mam_prefs"/>
+        android:title="@string/mam_prefs" />
 
     <item
         android:id="@+id/action_show_password"
         android:showAsAction="never"
-        android:title="@string/show_password"/>
+        android:title="@string/show_password" />
 
     <item
         android:id="@+id/action_change_password_on_server"
         android:showAsAction="always"
         android:icon="@drawable/ic_vpn_key_white_24dp"
-        android:title="@string/change_password"/>
+        android:title="@string/change_password" />
     <item
         android:id="@+id/mgmt_account_reconnect"
         android:showAsAction="never"
-        android:title="@string/mgmt_account_reconnect"/>
+        android:title="@string/mgmt_account_reconnect" />
     <item
         android:id="@+id/action_clear_devices"
         android:showAsAction="never"
-        android:title="@string/clear_other_devices"/>
+        android:title="@string/clear_other_devices" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index ab42a206b..89b6761ce 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <group android:checkableBehavior="single" >
+    <group android:checkableBehavior="single">
         <item
             android:id="@+id/encryption_choice_none"
-            android:title="@string/encryption_choice_unencrypted"/>
+            android:title="@string/encryption_choice_unencrypted" />
         <item
             android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_omemo"/>
+            android:title="@string/encryption_choice_omemo" />
         <item
             android:id="@+id/encryption_choice_otr"
-            android:title="@string/encryption_choice_otr"/>
+            android:title="@string/encryption_choice_otr" />
         <item
             android:id="@+id/encryption_choice_pgp"
-            android:title="@string/encryption_choice_pgp"/>
+            android:title="@string/encryption_choice_pgp" />
     </group>
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 2ce422a7b..38b82010b 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<item
-		android:id="@+id/action_add_account"
-		android:icon="?attr/icon_add_person"
-		android:showAsAction="always"
-		android:title="@string/action_add_account"/>
-	<item
-		android:id="@+id/action_add_account_with_cert"
-		android:showAsAction="never"
-		android:icon="?attr/icon_add_person"
-		android:title="@string/action_add_account_with_certificate"
-		android:visible="true"/>
-	<item
-		android:id="@+id/action_settings"
-		android:orderInCategory="100"
-		android:showAsAction="never"
-		android:title="@string/action_settings"/>
+    <item
+        android:id="@+id/action_add_account"
+        android:icon="?attr/icon_add_person"
+        android:showAsAction="always"
+        android:title="@string/action_add_account" />
+    <item
+        android:id="@+id/action_add_account_with_cert"
+        android:showAsAction="never"
+        android:icon="?attr/icon_add_person"
+        android:title="@string/action_add_account_with_certificate"
+        android:visible="true" />
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index 1205b3291..beca7b8ec 100644
--- a/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/mgmt_account_change_presence"
-        android:title="@string/change_presence"/>
+        android:title="@string/change_presence" />
     <item
         android:id="@+id/mgmt_account_publish_avatar"
-        android:title="@string/mgmt_account_publish_avatar"/>
+        android:title="@string/mgmt_account_publish_avatar" />
     <item
         android:id="@+id/mgmt_account_announce_pgp"
-        android:title="@string/mgmt_account_publish_pgp"/>
+        android:title="@string/mgmt_account_publish_pgp" />
     <item
         android:id="@+id/mgmt_account_reconnect"
         android:showAsAction="always"
-        android:title="@string/mgmt_account_reconnect"/>
+        android:title="@string/mgmt_account_reconnect" />
     <item
         android:id="@+id/mgmt_account_delete"
-        android:title="@string/mgmt_account_delete"/>
+        android:title="@string/mgmt_account_delete" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 7f95d712a..0c3220683 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/copy_text"
         android:title="@string/copy_text"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/select_text"
         android:title="@string/select_text"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/retry_decryption"
         android:title="Retry decryption"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/correct_message"
         android:title="@string/correct_message"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/share_with"
         android:title="@string/share_with"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/copy_url"
         android:title="@string/copy_original_url"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/show_error_message"
         android:title="@string/show_error_message"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/send_again"
         android:title="@string/send_again"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/download_file"
         android:title="@string/download_x_file"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/cancel_transmission"
         android:title="@string/cancel_transmission"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/delete_file"
         android:title="@string/delete_x_file"
-        android:visible="false"/>
+        android:visible="false" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 5ee463de5..cf0d6c3b8 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -6,30 +6,30 @@
         android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:title="@string/action_edit_subject"/>
+        android:title="@string/action_edit_subject" />
     <item
         android:id="@+id/action_share"
         android:icon="?attr/icon_share"
         android:showAsAction="always"
         android:orderInCategory="15"
-        android:title="@string/share_uri_with"/>
+        android:title="@string/share_uri_with" />
 
     <item
         android:id="@+id/action_save_as_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never"
-        android:title="@string/save_as_bookmark"/>
+        android:title="@string/save_as_bookmark" />
     <item
         android:id="@+id/action_delete_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never"
-        android:title="@string/delete_bookmark"/>
+        android:title="@string/delete_bookmark" />
     <item
         android:id="@+id/action_advanced_mode"
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="85"
         android:showAsAction="never"
-        android:title="@string/advanced_mode"/>
+        android:title="@string/advanced_mode" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index edbb2264a..4760cec44 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
+    <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/action_contact_details"
         android:title="@string/action_contact_details"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/invite"
         android:title="@string/invite_again"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/send_private_message"
         android:title="@string/send_private_message"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/give_membership"
         android:title="@string/grant_membership"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/give_admin_privileges"
         android:title="@string/grant_admin_privileges"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/remove_admin_privileges"
         android:title="@string/remove_admin_privileges"
-        android:visible="false"/>
+        android:visible="false" />
 
     <item
         android:id="@+id/remove_membership"
         android:title="@string/remove_membership"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/ban_from_conference"
         android:title="@string/ban_from_conference"
-        android:visible="false"/>
+        android:visible="false" />
     <item
         android:id="@+id/remove_from_room"
         android:title="@string/remove_from_room"
-        android:visible="false"/>
+        android:visible="false" />
 </menu>
diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml
index 2e2fc5dac..f63a3439b 100644
--- a/src/main/res/menu/omemo_key_context.xml
+++ b/src/main/res/menu/omemo_key_context.xml
@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/purge_omemo_key"
-        android:title="@string/purge_key"/>
+        android:title="@string/purge_key" />
     <item
         android:id="@+id/copy_omemo_key"
-        android:title="@string/copy_fingerprint"/>
+        android:title="@string/copy_fingerprint" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml
index 1bffb2961..39478c0a4 100644
--- a/src/main/res/menu/publish_avatar.xml
+++ b/src/main/res/menu/publish_avatar.xml
@@ -4,5 +4,5 @@
         android:id="@+id/action_crop_image"
         android:showAsAction="always"
         android:icon="@drawable/ic_crop_white_24dp"
-        android:title="@string/select_image_and_crop"/>
+        android:title="@string/select_image_and_crop" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml
index 4240849fd..efd6e4d0a 100644
--- a/src/main/res/menu/select_multiple.xml
+++ b/src/main/res/menu/select_multiple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/selection_submit"
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index bc51f4625..ff87edc1a 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_add"
         android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:title="@string/action_add"/>
+        android:title="@string/action_add" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml
index 227b9970f..3eb0647c9 100644
--- a/src/main/res/menu/showlocation.xml
+++ b/src/main/res/menu/showlocation.xml
@@ -4,5 +4,5 @@
         android:id="@+id/action_navigate"
         android:showAsAction="always"
         android:title="@string/navigate"
-        android:icon="@drawable/ic_navigation_white_24dp"/>
+        android:icon="@drawable/ic_navigation_white_24dp" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 305ffd223..27e9fc29b 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -20,10 +20,10 @@
         <menu>
             <item
                 android:id="@+id/action_join_conference"
-                android:title="@string/join_conference"/>
+                android:title="@string/join_conference" />
             <item
                 android:id="@+id/action_create_conference"
-                android:title="@string/create_conference"/>
+                android:title="@string/create_conference" />
 
         </menu>
     </item>
@@ -38,6 +38,6 @@
         android:checked="false"
         android:orderInCategory="85"
         android:showAsAction="never"
-        android:title="@string/hide_offline"/>
+        android:title="@string/hide_offline" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml
index e833ba79d..57d45dcde 100644
--- a/src/main/res/menu/verification_choices.xml
+++ b/src/main/res/menu/verification_choices.xml
@@ -3,10 +3,10 @@
 
     <item
         android:id="@+id/scan_fingerprint"
-        android:title="@string/scan_qr_code"/>
+        android:title="@string/scan_qr_code" />
     <item
         android:id="@+id/ask_question"
-        android:title="@string/ask_question"/>
+        android:title="@string/ask_question" />
 
     <item
         android:id="@+id/manual_verification"
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 42b66ad5b..17b6562c2 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<item
-		android:id="@+id/action_show_qr_code"
-		android:title="@string/show_qr_code"
-		android:showAsAction="never" />
+    <item
+        android:id="@+id/action_show_qr_code"
+        android:title="@string/show_qr_code"
+        android:showAsAction="never" />
 
     <item
         android:id="@+id/action_accounts"