diff --git a/src/action-sheets/index.js b/src/action-sheets/index.js
index c3a53abbabc..d1132f48364 100644
--- a/src/action-sheets/index.js
+++ b/src/action-sheets/index.js
@@ -729,7 +729,6 @@ export const constructMessageActionButtons = (args: {|
   }
   if (message.sender_id === ownUser.user_id && messageNotDeleted(message)) {
     // TODO(#2793): Don't show if message isn't deletable.
-    buttons.push(deleteMessage);
   }
   if (
     // When do we offer "Mark as unread from here"?  This logic parallels
diff --git a/src/chat/ChatScreen.js b/src/chat/ChatScreen.js
index 7c64e888cc5..2fe224e6e63 100644
--- a/src/chat/ChatScreen.js
+++ b/src/chat/ChatScreen.js
@@ -200,7 +200,7 @@ export default function ChatScreen(props: Props): Node {
           () => undefined,
         );
 
-        if ((content !== undefined && content !== '') || (topic !== undefined && topic !== '')) {
+        if (content !== undefined || topic !== undefined) {
           api.updateMessage(auth, editMessage.id, { content, subject: topic }).catch(error => {
             showErrorAlert(_('Failed to edit message'), error.message);
           });
diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
index da6d86014c3..fb4a6afc437 100644
--- a/src/compose/ComposeBox.js
+++ b/src/compose/ComposeBox.js
@@ -541,7 +541,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
       result.push('mandatory-topic-empty');
     }
 
-    if (messageInputValue.trim().length === 0) {
+    if (messageInputValue.trim().length === 0 && !isEditing) {
       result.push('message-empty');
     }
 
@@ -560,6 +560,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
     numUploading,
     anyQuoteAndReplyInProgress,
     messageInputState,
+    isEditing,
   ]);
 
   const submitButtonDisabled = validationErrors.length > 0;