diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index 6d412f67de4e4..ced74ca48d524 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -767,15 +767,16 @@ QVariantList ActivityListModel::convertLinksToActionButtons(const Activity &acti
         return customList;
     }
 
-    if (static_cast<quint32>(activity._links.size()) > maxActionButtons()) {
+    if (activity._links.size() > 0) {
         customList << ActivityListModel::convertLinkToActionButton(activity._links.first());
-        return customList;
     }
 
     for (const auto &activityLink : activity._links) {
         if (activityLink._verb == QStringLiteral("DELETE")
-            || (activity._objectType == QStringLiteral("chat") || activity._objectType == QStringLiteral("call")
-                || activity._objectType == QStringLiteral("room"))) {
+            || (activityLink._verb != QStringLiteral("REPLY")
+                && (activity._objectType == QStringLiteral("chat")
+                    || activity._objectType == QStringLiteral("call")
+                    || activity._objectType == QStringLiteral("room")))) {
             customList << ActivityListModel::convertLinkToActionButton(activityLink);
         }
     }