diff --git a/src/conversations/AndroidManifest.xml b/src/conversations/AndroidManifest.xml
index c79e4e265..87c925fe6 100644
--- a/src/conversations/AndroidManifest.xml
+++ b/src/conversations/AndroidManifest.xml
@@ -24,57 +24,8 @@
             android:launchMode="singleTask" />
         <activity
             android:name=".ui.ImportBackupActivity"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/restore_backup"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/vnd.conversations.backup" />
-                <data android:scheme="content" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/vnd.conversations.backup" />
-                <data android:scheme="file" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="content" />
-                <data android:host="*" />
-                <data android:mimeType="*/*" />
-                <data android:pathPattern=".*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.ceb" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="file" />
-                <data android:host="*" />
-                <data android:mimeType="*/*" />
-                <data android:pathPattern=".*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.ceb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.ceb" />
-            </intent-filter>
-        </activity>
+            android:launchMode="singleTask" />
     </application>
 </manifest>
diff --git a/src/conversations/res/layout/dialog_enter_password.xml b/src/conversations/res/layout/dialog_enter_password.xml
index 40f3ba34d..29b50d4ef 100644
--- a/src/conversations/res/layout/dialog_enter_password.xml
+++ b/src/conversations/res/layout/dialog_enter_password.xml
@@ -22,6 +22,13 @@
             android:text="@string/restore_warning"
             android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
+        <TextView
+            android:layout_marginTop="?TextSizeBody1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/restore_warning_continued"
+            android:textAppearance="@style/TextAppearance.Conversations.Subhead.Bold"/>
+
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/account_password_layout"
             android:layout_width="match_parent"
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9b92438eb..6676e18b4 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -69,7 +69,7 @@
             <action android:name="android.intent.action.VIEW" />
         </intent>
         <intent>
-            <action android:name="org.unifiedpush.android.connector.MESSAGE"/>
+            <action android:name="org.unifiedpush.android.connector.MESSAGE" />
         </intent>
     </queries>
 
@@ -119,7 +119,7 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-                <data android:scheme="package"/>
+                <data android:scheme="package" />
             </intent-filter>
         </receiver>
 
@@ -309,7 +309,9 @@
             android:label="@string/media_browser" />
 
         <service android:name=".services.ExportBackupService" />
-        <service android:name=".services.ImportBackupService" />
+        <service
+            android:name=".services.ImportBackupService"
+            android:exported="false" />
         <service
             android:name=".services.ContactChooserTargetService"
             android:exported="true"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7130aa6a7..d3af22e15 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -846,6 +846,7 @@
     <string name="restore">Restore</string>
     <string name="enter_password_to_restore">Enter your password for the account %s to restore the backup.</string>
     <string name="restore_warning">Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you’ve lost the original device.</string>
+    <string name="restore_warning_continued">Do not attempt to restore backups that you have not created yourself!</string>
     <string name="unable_to_restore_backup">Could not restore backup.</string>
     <string name="unable_to_decrypt_backup">Could not decrypt backup. Is the password correct?</string>
     <string name="backup_channel_name">Backup &amp; Restore</string>