diff --git a/src/main/res/values-sw600dp/defaults.xml b/src/main/res/values-sw640dp/defaults.xml
similarity index 72%
rename from src/main/res/values-sw600dp/defaults.xml
rename to src/main/res/values-sw640dp/defaults.xml
index c06e0147ee732340df3dba9567aa90076c64aa47..0dea382648d0f639cca9694e31dc555c633c1435 100644
--- a/src/main/res/values-sw600dp/defaults.xml
+++ b/src/main/res/values-sw640dp/defaults.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="portrait_only">false</bool>
+    <bool name="align_start">true</bool>
 </resources>
diff --git a/src/main/res/values-sw600dp/device.xml b/src/main/res/values-sw640dp/device.xml
similarity index 100%
rename from src/main/res/values-sw600dp/device.xml
rename to src/main/res/values-sw640dp/device.xml
diff --git a/src/main/res/xml/preferences_interface_bubbles.xml b/src/main/res/xml/preferences_interface_bubbles.xml
index 7c12b1b6ff29c8db6c26e3f38aa7ade3871be7b7..0572a8159f32adf68e02b64f144b4f3a01980b47 100644
--- a/src/main/res/xml/preferences_interface_bubbles.xml
+++ b/src/main/res/xml/preferences_interface_bubbles.xml
@@ -7,6 +7,7 @@
         android:summary="@string/pref_use_colorful_bubbles_summary"
         android:title="@string/pref_use_colorful_bubbles" />
     <SwitchPreferenceCompat
+        android:defaultValue="@bool/align_start"
         android:icon="@drawable/ic_format_align_left_24dp"
         android:key="align_start"
         android:summary="@string/pref_align_start_summary"