Improved hostmask settings UI

app/src/main/res/values-de/strings_preferences.xml

@@ -46,7 +46,7 @@
   <string name="preference_hostmask_actions_title">Hostmaske in Aktionen</string>
   <string name="preference_hostmask_actions_summary">Zeigt Ident und Host in Betreten/Verlassen-Nachrichten</string>
 
-  <string name="preference_hostmask_plain_title">Hostmaske</string>
+  <string name="preference_hostmask_plain_title">Hostmaske in normalen Nachrichten</string>
   <string name="preference_hostmask_plain_summary">Zeigt Ident und Host in normalen Nachrichten</string>
 
   <string name="preference_nicks_on_new_line_title">Separate Spitznamen</string>

app/src/main/res/values/strings_preferences.xml

@@ -104,7 +104,7 @@
   <string name="preference_hostmask_actions_summary">Display the full nick!ident@host in join/part/quit messages</string>
 
   <string name="preference_hostmask_plain_key" translatable="false">hostmask_plain</string>
-  <string name="preference_hostmask_plain_title">Show Hostmask</string>
+  <string name="preference_hostmask_plain_title">Show Hostmask in normal messages</string>
   <string name="preference_hostmask_plain_summary">Display the full nick!ident@host in normal messages</string>
 
   <string name="preference_nicks_on_new_line_key" translatable="false">nicks_on_new_line</string>

app/src/main/res/xml/preferences.xml

@@ -80,6 +80,12 @@
       android:key="@string/preference_show_avatars_key"
       android:title="@string/preference_show_avatars_title" />
 
+    <SwitchPreference
+      android:defaultValue="false"
+      android:key="@string/preference_hostmask_actions_key"
+      android:summary="@string/preference_hostmask_actions_summary"
+      android:title="@string/preference_hostmask_actions_title" />
+
     <SwitchPreference
       android:defaultValue="false"
       android:dependency="@string/preference_nicks_on_new_line_key"
@@ -87,12 +93,6 @@
       android:summary="@string/preference_hostmask_plain_summary"
       android:title="@string/preference_hostmask_plain_title" />
 
-    <SwitchPreference
-      android:defaultValue="false"
-      android:key="@string/preference_hostmask_actions_key"
-      android:summary="@string/preference_hostmask_actions_summary"
-      android:title="@string/preference_hostmask_actions_title" />
-
     <SwitchPreference
       android:defaultValue="false"
       android:key="@string/preference_time_at_end_key"