diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f3789099d..4f854b5a9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -209,7 +209,6 @@
             android:windowSoftInputMode="stateAlwaysHidden"/>
         <activity
             android:name=".ui.AboutActivity"
-            android:label="@string/title_activity_about"
             android:parentActivityName=".ui.SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
index 13d87c78d..e8435efdc 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
@@ -20,5 +20,7 @@ public class AboutActivity extends AppCompatActivity {
         setContentView(R.layout.activity_about);
         setSupportActionBar(findViewById(R.id.toolbar));
         configureActionBar(getSupportActionBar());
+        setTitle(getString(R.string.title_activity_about_x, getString(R.string.app_name
+        )));
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java
index c0f039037..455058d01 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java
+++ b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java
@@ -11,12 +11,16 @@ import eu.siacs.conversations.utils.PhoneHelper;
 public class AboutPreference extends Preference {
 	public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) {
 		super(context, attrs, defStyle);
-		setSummary();
+        final String appName = context.getString(R.string.app_name);
+        setSummary(appName +' '+ PhoneHelper.getVersionName(context));
+        setTitle(context.getString(R.string.title_activity_about_x, appName));
 	}
 
 	public AboutPreference(final Context context, final AttributeSet attrs) {
 		super(context, attrs);
-		setSummary();
+		final String appName = context.getString(R.string.app_name);
+		setSummary(appName +' '+ PhoneHelper.getVersionName(context));
+		setTitle(context.getString(R.string.title_activity_about_x, appName));
 	}
 
     @Override
@@ -25,9 +29,5 @@ public class AboutPreference extends Preference {
         final Intent intent = new Intent(getContext(), AboutActivity.class);
         getContext().startActivity(intent);
     }
-
-    private void setSummary() {
-		setSummary(getContext().getString(R.string.app_name) +' '+ PhoneHelper.getVersionName(getContext()));
-	}
 }
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d16c302a2..6bf09dc44 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -268,8 +268,7 @@
     <string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string>
     <string name="pref_expert_options">Expert settings</string>
     <string name="pref_expert_options_summary">Please be careful with these</string>
-    <string name="title_activity_about">About Conversations</string>
-    <string name="pref_about_conversations_summary">Build and licensing information</string>
+    <string name="title_activity_about_x">About %s</string>
     <string name="title_pref_quiet_hours">Quiet Hours</string>
     <string name="title_pref_quiet_hours_start_time">Start time</string>
     <string name="title_pref_quiet_hours_end_time">End time</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index c7f4b159c..ab5d21263 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -342,7 +342,5 @@
             android:summary="@string/pref_never_send_crash_summary"
             android:title="@string/pref_never_send_crash" />
     </PreferenceCategory>
-    <eu.siacs.conversations.ui.AboutPreference
-        android:summary="@string/pref_about_conversations_summary"
-        android:title="@string/title_activity_about" />
+    <eu.siacs.conversations.ui.AboutPreference/>
 </PreferenceScreen>