diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e4ba6941..9e26cbd7 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -43,62 +43,6 @@
             </RelativeLayout>
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/settings_notifications_label"
-            style="@style/SettingsSectionLabelStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/notifications" />
-
-        <LinearLayout
-            android:id="@+id/settings_notifications_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/settings_customize_notifications_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_top_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_customize_notifications_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/customize_notifications" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_lock_screen_visibility_holder"
-                style="@style/SettingsHolderTextViewStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_bottom_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_lock_screen_visibility_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/lock_screen_visibility" />
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_lock_screen_visibility"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_lock_screen_visibility_label"
-                    tools:text="@string/sender_and_message" />
-
-            </RelativeLayout>
-        </LinearLayout>
-
         <TextView
             android:id="@+id/settings_general_settings_label"
             style="@style/SettingsSectionLabelStyle"
@@ -202,6 +146,62 @@
             </RelativeLayout>
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/settings_notifications_label"
+            style="@style/SettingsSectionLabelStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/notifications" />
+
+        <LinearLayout
+            android:id="@+id/settings_notifications_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/medium_margin"
+            android:background="@drawable/section_holder_stroke"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/settings_customize_notifications_holder"
+                style="@style/SettingsHolderTextViewOneLinerStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ripple_top_corners">
+
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/settings_customize_notifications_label"
+                    style="@style/SettingsTextLabelStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/customize_notifications" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/settings_lock_screen_visibility_holder"
+                style="@style/SettingsHolderTextViewStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ripple_bottom_corners">
+
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/settings_lock_screen_visibility_label"
+                    style="@style/SettingsTextLabelStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lock_screen_visibility" />
+
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/settings_lock_screen_visibility"
+                    style="@style/SettingsTextValueStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/settings_lock_screen_visibility_label"
+                    tools:text="@string/sender_and_message" />
+
+            </RelativeLayout>
+        </LinearLayout>
+
         <TextView
             android:id="@+id/settings_outgoing_messages_label"
             style="@style/SettingsSectionLabelStyle"