diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index b4b6ebc12f..1776bd341f 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -87,6 +87,7 @@
 
     <!-- Manifest -->
     <issue id="PermissionImpliesUnsupportedChromeOsHardware" severity="error" />
+    <issue id="DataExtractionRules" severity="error" />
 
     <!-- Performance -->
     <issue id="UselessParent" severity="error" />
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index d60620dddf..c7c0d40dd7 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -318,12 +318,12 @@
         <activity android:name=".features.poll.create.CreatePollActivity" />
         <activity android:name=".features.location.LocationSharingActivity" />
         <activity android:name=".features.location.live.map.LiveLocationMapViewActivity" />
-        <activity android:name=".features.settings.font.FontScaleSettingActivity"/>
+        <activity android:name=".features.settings.font.FontScaleSettingActivity" />
         <activity android:name=".features.call.dialpad.PstnDialActivity" />
-        <activity android:name=".features.home.room.list.home.invites.InvitesActivity"/>
-        <activity android:name=".features.home.room.list.home.release.ReleaseNotesActivity"/>
-        <activity android:name=".features.settings.devices.v2.overview.SessionOverviewActivity"/>
-        <activity android:name=".features.settings.devices.v2.details.SessionDetailsActivity"/>
+        <activity android:name=".features.home.room.list.home.invites.InvitesActivity" />
+        <activity android:name=".features.home.room.list.home.release.ReleaseNotesActivity" />
+        <activity android:name=".features.settings.devices.v2.overview.SessionOverviewActivity" />
+        <activity android:name=".features.settings.devices.v2.details.SessionDetailsActivity" />
 
         <!-- Services -->
 
diff --git a/vector/src/main/res/xml/backup_rules.xml b/vector/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000000..fe10b316ed
--- /dev/null
+++ b/vector/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude
+        domain="file"
+        path="." />
+    <exclude
+        domain="database"
+        path="." />
+    <exclude
+        domain="sharedpref"
+        path="." />
+    <exclude
+        domain="external"
+        path="." />
+    <exclude
+        domain="root"
+        path="." />
+</full-backup-content>
diff --git a/vector/src/main/res/xml/data_extraction_rules.xml b/vector/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000000..fe61eb717c
--- /dev/null
+++ b/vector/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>