diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f23d05c..d5cf95d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,30 +19,32 @@
     package="com.android.messaging"
     android:installLocation="internalOnly">
 
-    <uses-sdk android:minSdkVersion="33" android:targetSdkVersion="34" />
+    <uses-sdk
+        android:minSdkVersion="33"
+        android:targetSdkVersion="34" />
 
     <!-- Application holds CPU wakelock while working in background -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <!-- Application needs SMS/MMS permissions -->
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_MMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
     <!-- Application needs access to MMS network -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <!-- Application needs CONTACT permissions -->
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <!-- Application needs to read profiles for the user itself from CP2 -->
-    <uses-permission android:name="android.permission.READ_PROFILE"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PROFILE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
@@ -50,17 +52,31 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!--  Optional features -->
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.front" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-    <uses-feature android:name="android.hardware.microphone" android:required="false" />
-    <uses-feature android:name="android.hardware.screen.portrait" android:required="false" />
-    <uses-feature android:name="android.hardware.telephony" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.front"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.screen.portrait"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <queries>
         <intent>
-            <action android:name="android.intent.action.SENDTO"/>
-            <data android:scheme="smsto" android:host="*" />
+            <action android:name="android.intent.action.SENDTO" />
+            <data
+                android:host="*"
+                android:scheme="smsto" />
         </intent>
     </queries>
 
@@ -71,19 +87,19 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/BugleTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/BugleTheme">
 
         <!-- Displays a list of conversations -->
         <activity
             android:name=".ui.conversationlist.ConversationListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
-            android:label="@string/app_name"
             android:exported="true"
+            android:screenOrientation="user"
             android:theme="@style/LaunchTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.APP_MESSAGING" />
@@ -92,23 +108,25 @@
 
         <activity
             android:name=".ui.PermissionCheckActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize|keyboardHidden" />
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
 
         <!-- Launches a conversation (ensures correct app name shown in recents) -->
         <activity
             android:name=".ui.conversation.LaunchConversationActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
-            android:theme="@style/Invisible"
-            android:noHistory="true"
+            android:documentLaunchMode="always"
             android:exported="true"
-            android:documentLaunchMode="always">
+            android:noHistory="true"
+            android:screenOrientation="user"
+            android:theme="@style/Invisible">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SENDTO" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="sms" />
                 <data android:scheme="smsto" />
                 <data android:scheme="mms" />
@@ -120,65 +138,66 @@
         <activity
             android:name=".ui.conversationlist.ArchivedConversationListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/archived_activity_title"
-            android:theme="@style/BugleTheme.ArchivedConversationListActivity"
-            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme.ArchivedConversationListActivity" />
 
         <!-- Displays the contents of a single conversation -->
         <activity
             android:name=".ui.conversation.ConversationActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity"
             android:screenOrientation="user"
-            android:windowSoftInputMode="stateHidden|adjustResize"
             android:theme="@style/BugleTheme.ConversationActivity"
-            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+            android:windowSoftInputMode="stateHidden|adjustResize" />
 
         <!-- Blocked Participants -->
         <activity
             android:name=".ui.BlockedParticipantsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/blocked_contacts_title"
-            android:theme="@style/BugleTheme"
-            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme" />
 
         <!-- Full-screen photo viewer -->
         <activity
             android:name=".ui.photoviewer.BuglePhotoViewActivity"
-            android:label="@string/photo_view_activity_title"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/photo_view_activity_title"
             android:screenOrientation="user"
             android:theme="@style/BuglePhotoViewTheme"
-        />
+            />
 
         <!-- Settings -->
         <activity
             android:name=".ui.appsettings.SettingsActivity"
-            android:label="@string/settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/settings_activity_title"
+            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity"
             android:screenOrientation="user"
-            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity" />
+            android:theme="@style/BugleTheme.SettingsActivity" />
 
         <activity
             android:name=".ui.appsettings.PerSubscriptionSettingsActivity"
-            android:label="@string/advanced_settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/advanced_settings_activity_title"
+            android:parentActivityName="com.android.messaging.ui.appsettings.SettingsActivity"
             android:screenOrientation="user"
-            android:parentActivityName="com.android.messaging.ui.appsettings.SettingsActivity" />
+            android:theme="@style/BugleTheme.SettingsActivity" />
 
         <activity
             android:name=".ui.appsettings.ApplicationSettingsActivity"
-            android:label="@string/general_settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
+            android:exported="true"
+            android:label="@string/general_settings_activity_title"
             android:parentActivityName="com.android.messaging.ui.appsettings.SettingsActivity"
-            android:exported="true">
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme.SettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
             </intent-filter>
@@ -188,16 +207,18 @@
         <activity
             android:name=".ui.conversationlist.ShareIntentActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
-            android:theme="@style/BugleTheme.DialogActivity"
+            android:documentLaunchMode="always"
             android:excludeFromRecents="true"
             android:exported="true"
-            android:documentLaunchMode="always">
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme.DialogActivity">
             <intent-filter
                 android:label="@string/share_intent_label">
                 <action android:name="android.intent.action.SEND" />
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
                 <data android:mimeType="text/x-vCard" />
                 <data android:mimeType="text/x-vcard" />
@@ -212,24 +233,25 @@
         <activity
             android:name=".ui.conversationsettings.PeopleAndOptionsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/people_and_options_activity_title"
-            android:theme="@style/BugleTheme"
-            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity" />
+            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme" />
 
-         <!-- License -->
-        <activity android:name=".ui.LicenseActivity"
+        <!-- License -->
+        <activity
+            android:name=".ui.LicenseActivity"
             android:exported="true"
-            android:theme="@android:style/Theme.Holo.Light.Dialog"
-            android:label="@string/menu_license">
+            android:label="@string/menu_license"
+            android:theme="@android:style/Theme.Holo.Light.Dialog">
         </activity>
 
         <!-- Message Forwarding -->
         <activity
             android:name=".ui.conversationlist.ForwardMessageActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/forward_message_activity_title"
+            android:screenOrientation="user"
             android:theme="@style/BugleTheme.DialogActivity">
         </activity>
 
@@ -241,8 +263,8 @@
         <activity
             android:name=".ui.RemoteInputEntrypointActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:exported="false"
+            android:screenOrientation="user"
             android:theme="@style/Invisible">
         </activity>
 
@@ -250,52 +272,59 @@
         <activity
             android:name=".ui.VCardDetailActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/vcard_detail_activity_title"
-            android:theme="@style/BugleTheme"
-            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity" />
+            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme" />
 
         <!-- Attachment chooser -->
         <activity
             android:name=".ui.attachmentchooser.AttachmentChooserActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
             android:label="@string/attachment_chooser_activity_title"
-            android:theme="@style/BugleTheme"
-            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity" />
+            android:parentActivityName="com.android.messaging.ui.conversation.ConversationActivity"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme" />
 
-        <provider android:name=".datamodel.MessagingContentProvider" android:label="@string/app_name"
-                  android:authorities="com.android.messaging.datamodel.MessagingContentProvider"
-                  android:exported="false" >
+        <provider
+            android:name=".datamodel.MessagingContentProvider"
+            android:authorities="com.android.messaging.datamodel.MessagingContentProvider"
+            android:exported="false"
+            android:label="@string/app_name">
         </provider>
 
-        <provider android:name=".datamodel.MmsFileProvider"
-                  android:authorities="com.android.messaging.datamodel.MmsFileProvider"
-                  android:grantUriPermissions="true"
-                  android:exported="false" />
+        <provider
+            android:name=".datamodel.MmsFileProvider"
+            android:authorities="com.android.messaging.datamodel.MmsFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
 
-        <provider android:name=".datamodel.MediaScratchFileProvider"
-                  android:authorities="com.android.messaging.datamodel.MediaScratchFileProvider"
-                  android:grantUriPermissions="true"
-                  android:exported="false" />
+        <provider
+            android:name=".datamodel.MediaScratchFileProvider"
+            android:authorities="com.android.messaging.datamodel.MediaScratchFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
 
 
         <!-- Action Services -->
-        <service android:name=".datamodel.action.ActionServiceImpl"
-                 android:permission="android.permission.BIND_JOB_SERVICE"
-                 android:exported="true"/>
-        <service android:name=".datamodel.action.BackgroundWorkerService"
-                 android:permission="android.permission.BIND_JOB_SERVICE"
-                 android:exported="true"/>
+        <service
+            android:name=".datamodel.action.ActionServiceImpl"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".datamodel.action.BackgroundWorkerService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- Sms and Mms related items -->
 
         <!-- Intents for Notification and Pre-KLP Delivery -->
         <!-- Registered with the highest possible priority (max_int) -->
-        <receiver android:name=".receiver.SmsReceiver"
-                  android:enabled="false"
-                  android:exported="true"
-                  android:permission="android.permission.BROADCAST_SMS">
+        <receiver
+            android:name=".receiver.SmsReceiver"
+            android:enabled="false"
+            android:exported="true"
+            android:permission="android.permission.BROADCAST_SMS">
             <intent-filter android:priority="2147483647">
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
             </intent-filter>
@@ -305,25 +334,28 @@
         </receiver>
 
         <!-- Intents for KLP+ Delivery -->
-        <receiver android:name=".receiver.MmsWapPushDeliverReceiver"
-                  android:exported="true"
-                  android:permission="android.permission.BROADCAST_WAP_PUSH">
+        <receiver
+            android:name=".receiver.MmsWapPushDeliverReceiver"
+            android:exported="true"
+            android:permission="android.permission.BROADCAST_WAP_PUSH">
             <intent-filter>
                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
                 <data android:mimeType="application/vnd.wap.mms-message" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.SmsDeliverReceiver"
-                  android:exported="true"
-                  android:permission="android.permission.BROADCAST_SMS">
+        <receiver
+            android:name=".receiver.SmsDeliverReceiver"
+            android:exported="true"
+            android:permission="android.permission.BROADCAST_SMS">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_DELIVER" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receiver.SendStatusReceiver"
-                android:exported="false">
+        <receiver
+            android:name=".receiver.SendStatusReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.android.messaging.receiver.SendStatusReceiver.MESSAGE_SENT" />
                 <data android:scheme="content" />
@@ -341,12 +373,14 @@
             </intent-filter>
         </receiver>
 
-        <service android:name=".datamodel.NoConfirmationSmsSendService"
-                 android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
-                 android:exported="true" >
+        <service
+            android:name=".datamodel.NoConfirmationSmsSendService"
+            android:exported="true"
+            android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
             <intent-filter>
                 <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="sms" />
                 <data android:scheme="smsto" />
                 <data android:scheme="mms" />
@@ -354,20 +388,22 @@
             </intent-filter>
         </service>
 
-        <activity android:name=".ui.ClassZeroActivity"
-                  android:configChanges="orientation|screenSize|keyboardHidden"
-                  android:screenOrientation="user"
-                  android:label="@string/class_0_message_activity"
-                  android:theme="@style/BugleTheme.DialogActivity"
-                  android:launchMode="singleTask"
-                  android:excludeFromRecents="true">
+        <activity
+            android:name=".ui.ClassZeroActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:label="@string/class_0_message_activity"
+            android:launchMode="singleTask"
+            android:screenOrientation="user"
+            android:theme="@style/BugleTheme.DialogActivity">
         </activity>
 
-        <receiver android:name=".receiver.BootAndPackageReplacedReceiver"
+        <receiver
+            android:name=".receiver.BootAndPackageReplacedReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>
 
@@ -386,53 +422,60 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receiver.DefaultSmsSubscriptionChangeReceiver"
+        <receiver
+            android:name=".receiver.DefaultSmsSubscriptionChangeReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"/>
+                <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
             </intent-filter>
         </receiver>
 
         <!-- Widget that displays the conversation list -->
-        <receiver android:name=".widget.BugleWidgetProvider"
-                android:exported="true"
-                android:label="@string/widget_conversation_name">
+        <receiver
+            android:name=".widget.BugleWidgetProvider"
+            android:exported="true"
+            android:label="@string/widget_conversation_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                       android:resource="@xml/widget_conversation_list" />
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_conversation_list" />
         </receiver>
 
         <!-- Widget that displays the messages of a single conversation -->
-        <receiver android:name=".widget.WidgetConversationProvider"
-                android:exported="true"
-                android:label="@string/widget_conversation_name">
+        <receiver
+            android:name=".widget.WidgetConversationProvider"
+            android:exported="true"
+            android:label="@string/widget_conversation_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                       android:resource="@xml/widget_conversation" />
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_conversation" />
         </receiver>
 
-        <service android:name=".widget.WidgetConversationListService"
-                 android:permission="android.permission.BIND_REMOTEVIEWS"
-                 android:exported="false" />
+        <service
+            android:name=".widget.WidgetConversationListService"
+            android:exported="false"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
 
-        <service android:name=".widget.WidgetConversationService"
-                 android:permission="android.permission.BIND_REMOTEVIEWS"
-                 android:exported="false" />
+        <service
+            android:name=".widget.WidgetConversationService"
+            android:exported="false"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
 
-        <activity android:name=".ui.WidgetPickConversationActivity"
-            android:theme="@style/BugleTheme"
-                android:exported="true"
-            android:label="@string/app_name" >
+        <activity
+            android:name=".ui.WidgetPickConversationActivity"
+            android:exported="true"
+            android:theme="@style/BugleTheme">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
 
-        <service android:name="android.support.v7.mms.MmsService"/>
+        <service android:name="android.support.v7.mms.MmsService" />
     </application>
 
 </manifest>