diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index e06a27594..6b1a2ca87 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -273,7 +273,7 @@ class NotificationHelper {
             case Downloading:
                 return app.name;
             case ReadyToInstall:
-                return context.getString(R.string.notification_title_single_ready_to_install_update);
+                return context.getString(app.isInstalled() ? R.string.notification_title_single_ready_to_install_update : R.string.notification_title_single_ready_to_install);
             case Installing:
                 return app.name;
             case Installed:
@@ -289,7 +289,7 @@ class NotificationHelper {
             case UpdateAvailable:
                 return app.name;
             case Downloading:
-                return context.getString(R.string.notification_content_single_downloading_update, app.name);
+                return context.getString(app.isInstalled() ? R.string.notification_content_single_downloading_update : R.string.notification_content_single_downloading, app.name);
             case ReadyToInstall:
                 return app.name;
             case Installing:
@@ -302,14 +302,14 @@ class NotificationHelper {
         return "";
     }
 
-    private String getMultiItemContentString(AppUpdateStatusManager.Status status) {
+    private String getMultiItemContentString(App app, AppUpdateStatusManager.Status status) {
         switch (status) {
             case UpdateAvailable:
                 return context.getString(R.string.notification_title_summary_update_available);
             case Downloading:
-                return context.getString(R.string.notification_title_summary_downloading_update);
+                return context.getString(app.isInstalled() ? R.string.notification_title_summary_downloading_update : R.string.notification_title_summary_downloading);
             case ReadyToInstall:
-                return context.getString(R.string.notification_title_summary_ready_to_install_update);
+                return context.getString(app.isInstalled() ? R.string.notification_title_summary_ready_to_install_update : R.string.notification_title_summary_ready_to_install);
             case Installing:
                 return context.getString(R.string.notification_title_summary_installing);
             case Installed:
@@ -383,7 +383,7 @@ class NotificationHelper {
             App app = entry.app;
             AppUpdateStatusManager.Status status = entry.status;
 
-            String content = getMultiItemContentString(status);
+            String content = getMultiItemContentString(app, status);
             SpannableStringBuilder sb = new SpannableStringBuilder(app.name);
             sb.setSpan(new StyleSpan(Typeface.BOLD), 0, sb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
             sb.append(" ");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1839d6e6..2976c7f7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -401,8 +401,10 @@
     <!-- notifications -->
     <string name="notification_summary_more">+%1$d more…</string>
     <string name="notification_title_single_update_available">Update Available</string>
+    <string name="notification_title_single_ready_to_install">Ready to install</string>
     <string name="notification_title_single_ready_to_install_update">Update ready to install</string>
     <string name="notification_title_single_install_error">Install Failed</string>
+    <string name="notification_content_single_downloading">Downloading \"%1$s\"&#8230;</string>
     <string name="notification_content_single_downloading_update">Downloading update for \"%1$s\"&#8230;</string>
     <string name="notification_content_single_installing">Installing \"%1$s\"&#8230;</string>
     <string name="notification_content_single_installed">Successfully installed</string>
@@ -410,7 +412,9 @@
     <string name="notification_summary_updates">%1$d Updates</string>
     <string name="notification_summary_installed">%1$d Apps Installed</string>
     <string name="notification_title_summary_update_available">Update available</string>
+    <string name="notification_title_summary_downloading">Downloading&#8230;</string>
     <string name="notification_title_summary_downloading_update">Downloading update&#8230;</string>
+    <string name="notification_title_summary_ready_to_install">Ready to install</string>
     <string name="notification_title_summary_ready_to_install_update">Update ready to install</string>
     <string name="notification_title_summary_installing">Installing</string>
     <string name="notification_title_summary_installed">Successfully installed</string>