diff --git a/build.gradle b/build.gradle
index 7619b645..6fd93603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ android {
     testBuildType "mockdata"
 
     defaultConfig {
-        versionCode 341
+        versionCode 342
         versionName "4.29"
         minSdkVersion 22
         targetSdkVersion 31
diff --git a/res/layout/activity_message.xml b/res/layout/activity_message.xml
index ce648ae0..56eb76bc 100644
--- a/res/layout/activity_message.xml
+++ b/res/layout/activity_message.xml
@@ -92,7 +92,7 @@
                         android:background="?contentBackgroundColor"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
+                        android:paddingTop="8dp"
                         android:gravity="bottom">
 
                         <ImageButton
diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
index b02226c3..4b84fc05 100644
--- a/src/com/irccloud/android/activity/MainActivity.java
+++ b/src/com/irccloud/android/activity/MainActivity.java
@@ -5488,7 +5488,7 @@ public boolean onMessageLongClicked(Event event) {
 
             boolean canEdit = event.self;
             Server s = ServersList.getInstance().getServer(event.cid);
-            if(s == null || !(s.isSlack() || s.getOrgId() > 0))
+            if(s == null || !s.hasLabeledResponse())
                 canEdit = false;
 
             showUserPopup(user, ColorFormatter.html_to_spanned(ColorFormatter.irc_to_html(timestamp + " " + html), true, ServersList.getInstance().getServer(event.cid)), null, msgid, canEdit, event);
diff --git a/src/com/irccloud/android/data/model/Server.java b/src/com/irccloud/android/data/model/Server.java
index 50988d12..0e386d85 100644
--- a/src/com/irccloud/android/data/model/Server.java
+++ b/src/com/irccloud/android/data/model/Server.java
@@ -358,6 +358,10 @@ public boolean hasCap(String cap) {
         return false;
     }
 
+    public boolean hasLabeledResponse() {
+        return hasCap("labeled-response") || hasCap("draft/labeled-response") || hasCap("draft/labeled-response-0.2");
+    }
+
     public boolean clientTagDeny(String tagname) {
         if(isupport == null || !isupport.has("CLIENTTAGDENY") || !isupport.get("CLIENTTAGDENY").isTextual())
             return false;