diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 43e7f9222..57ce3a524 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1041,11 +1041,26 @@
     "message": "Delete messages",
     "description": "Menu item for deleting messages, title case."
   },
+  "deletePublicConversationConfirmation": {
+    "message": "Permanently delete the messages locally from this public channel?",
+    "description":
+      "Confirmation dialog text that asks the user if they really wish to delete the public channel messages locally. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone."
+  },
   "deleteConversationConfirmation": {
     "message": "Permanently delete this conversation?",
     "description":
       "Confirmation dialog text that asks the user if they really wish to delete the conversation. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone."
   },
+  "deletePublicChannel": {
+    "message": "Leave public channel",
+    "description":
+      "Confirmation dialog title that asks the user if they really wish to delete a public channel. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone."
+  },
+  "deletePublicChannelConfirmation": {
+    "message": "Leave this public channel?",
+    "description":
+      "Confirmation dialog text that tells the user what will happen if they leave the public channel."
+  },
   "deleteContact": {
     "message": "Delete contact",
     "description":
diff --git a/js/models/conversations.js b/js/models/conversations.js
index c48b3458f..7ee09277c 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -445,6 +445,7 @@
         color,
         type: this.isPrivate() ? 'direct' : 'group',
         isMe: this.isMe(),
+        isPublic: this.isPublic(),
         isClosable: this.isClosable(),
         isTyping: typingKeys.length > 0,
         lastUpdated: this.get('timestamp'),
@@ -2311,10 +2312,17 @@
     },
 
     deleteContact() {
-      Whisper.events.trigger('showConfirmationDialog', {
-        message: i18n('deleteContactConfirmation'),
-        onOk: () => ConversationController.deleteContact(this.id),
-      });
+      if (this.isPublic()) {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deletePublicChannelConfirmation'),
+          onOk: () => ConversationController.deleteContact(this.id),
+        });
+      } else {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deleteContactConfirmation'),
+          onOk: () => ConversationController.deleteContact(this.id),
+        });
+      }
     },
 
     async deletePublicMessage(message) {
@@ -2343,10 +2351,17 @@
     },
 
     deleteMessages() {
-      Whisper.events.trigger('showConfirmationDialog', {
-        message: i18n('deleteConversationConfirmation'),
-        onOk: () => this.destroyMessages(),
-      });
+      if (this.isPublic()) {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deletePublicConversationConfirmation'),
+          onOk: () => ConversationController.deleteContact(this.id),
+        });
+      } else {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deleteContactConfirmation'),
+          onOk: () => ConversationController.deleteContact(this.id),
+        });
+      }
     },
 
     async destroyMessages() {
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 055a829a6..d057bba7e 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -206,6 +206,7 @@
           isGroup: !this.model.isPrivate(),
           isOnline: this.model.isOnline(),
           isArchived: this.model.get('isArchived'),
+          isPublic: this.model.isPublic(),
 
           expirationSettingName,
           showBackButton: Boolean(this.panels && this.panels.length),
@@ -1510,20 +1511,37 @@
     },
 
     destroyMessages() {
-      Whisper.events.trigger('showConfirmationDialog', {
-        message: i18n('deleteConversationConfirmation'),
-        onOk: async () => {
-          try {
-            await this.model.destroyMessages();
-            this.unload('delete messages');
-          } catch (error) {
-            window.log.error(
-              'destroyMessages: Failed to successfully delete conversation',
-              error && error.stack ? error.stack : error
-            );
-          }
-        },
-      });
+      if (this.model.isPublic()) {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deletePublicConversationConfirmation'),
+          onOk: async () => {
+            try {
+              await this.model.destroyMessages();
+              this.unload('delete messages');
+            } catch (error) {
+              window.log.error(
+                'destroyMessages: Failed to successfully delete conversation',
+                error && error.stack ? error.stack : error
+              );
+            }
+          },
+        });
+      } else {
+        Whisper.events.trigger('showConfirmationDialog', {
+          message: i18n('deleteConversationConfirmation'),
+          onOk: async () => {
+            try {
+              await this.model.destroyMessages();
+              this.unload('delete messages');
+            } catch (error) {
+              window.log.error(
+                'destroyMessages: Failed to successfully delete conversation',
+                error && error.stack ? error.stack : error
+              );
+            }
+          },
+        });
+      }
     },
 
     showSendConfirmationDialog(e, contacts) {
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index f14d01856..5d4ea63f3 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -21,6 +21,7 @@ export type PropsData = {
   type: 'group' | 'direct';
   avatarPath?: string;
   isMe: boolean;
+  isPublic?: boolean;
   isClosable?: boolean;
 
   lastUpdated: number;
@@ -165,6 +166,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
       isBlocked,
       isMe,
       isClosable,
+      isPublic,
       hasNickname,
       onDeleteContact,
       onDeleteMessages,
@@ -180,21 +182,27 @@ export class ConversationListItem extends React.PureComponent<Props> {
 
     return (
       <ContextMenu id={triggerId}>
-        {!isMe ? (
+        {!isPublic && !isMe ? (
           <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
         ) : null}
-        {!isMe ? (
+        {!isPublic && !isMe ? (
           <MenuItem onClick={onChangeNickname}>
             {i18n('changeNickname')}
           </MenuItem>
         ) : null}
-        {!isMe && hasNickname ? (
+        {!isPublic && !isMe && hasNickname ? (
           <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
         ) : null}
-        <MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem>
+        {!isPublic ? (
+          <MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem>
+        ) : null}
         <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
         {!isMe && isClosable ? (
-          <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+          !isPublic ? (
+            <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+          ) : (
+            <MenuItem onClick={onDeleteContact}>{i18n('deletePublicChannel')}</MenuItem>
+          )
         ) : null}
       </ContextMenu>
     );
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index dfc10c197..7b221f10d 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -29,6 +29,7 @@ interface Props {
   isClosable?: boolean;
   isGroup: boolean;
   isArchived: boolean;
+  isPublic: boolean;
 
   expirationSettingName?: string;
   showBackButton: boolean;
@@ -205,6 +206,7 @@ export class ConversationHeader extends React.Component<Props> {
       isClosable,
       isGroup,
       isArchived,
+      isPublic,
       onDeleteMessages,
       onDeleteContact,
       onResetSession,
@@ -230,55 +232,63 @@ export class ConversationHeader extends React.Component<Props> {
 
     return (
       <ContextMenu id={triggerId}>
-        <SubMenu title={disappearingTitle}>
-          {(timerOptions || []).map(item => (
-            <MenuItem
-              key={item.value}
-              onClick={() => {
-                onSetDisappearingMessages(item.value);
-              }}
-            >
-              {item.name}
-            </MenuItem>
-          ))}
-        </SubMenu>
+        {!isPublic ? (
+          <SubMenu title={disappearingTitle}>
+            {(timerOptions || []).map(item => (
+              <MenuItem
+                key={item.value}
+                onClick={() => {
+                  onSetDisappearingMessages(item.value);
+                }}
+              >
+                {item.name}
+              </MenuItem>
+            ))}
+          </SubMenu>
+        ) : null}
         {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
-        {isGroup ? (
+        {!isPublic && isGroup ? (
           <MenuItem onClick={onShowGroupMembers}>
             {i18n('showMembers')}
           </MenuItem>
         ) : null}
-        {!isGroup && !isMe ? (
+        {!isPublic && !isGroup && !isMe ? (
           <MenuItem onClick={onShowSafetyNumber}>
             {i18n('showSafetyNumber')}
           </MenuItem>
         ) : null}
-        {!isGroup ? (
+        {!isPublic && !isGroup ? (
           <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
         ) : null}
         {/* Only show the block on other conversations */}
-        {!isMe ? (
+        {!isPublic && !isMe ? (
           <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
         ) : null}
-        {!isMe ? (
+        {!isPublic && !isMe ? (
           <MenuItem onClick={onChangeNickname}>
             {i18n('changeNickname')}
           </MenuItem>
         ) : null}
-        {!isMe && hasNickname ? (
+        {!isPublic && !isMe && hasNickname ? (
           <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
         ) : null}
         <MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem>
-        {isArchived ? (
-          <MenuItem onClick={onMoveToInbox}>
-            {i18n('moveConversationToInbox')}
-          </MenuItem>
-        ) : (
-          <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
-        )}
+        {!isPublic ? (
+          isArchived ? (
+            <MenuItem onClick={onMoveToInbox}>
+              {i18n('moveConversationToInbox')}
+            </MenuItem>
+          ) : (
+            <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
+          )
+        ) : null}
         <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
         {!isMe && isClosable ? (
-          <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+          !isPublic ? (
+            <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+          ) : (
+            <MenuItem onClick={onDeleteContact}>{i18n('deletePublicChannel')}</MenuItem>
+          )
         ) : null}
       </ContextMenu>
     );
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 77379eb03..b0ced5094 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -45,6 +45,7 @@ export type ConversationType = {
   phoneNumber: string;
   type: 'direct' | 'group';
   isMe: boolean;
+  isPublic?: boolean;
   isClosable?: boolean;
   lastUpdated: number;
   unreadCount: number;