diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index f0d4e021b..198d06fbd 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -419,6 +419,7 @@ export class ConversationHeader extends React.Component<Props> {
     $('.session-search-input input').focus();
   }
 
+  // tslint:disable-next-line: cyclomatic-complexity
   private renderPublicMenuItems() {
     const {
       i18n,
@@ -438,9 +439,10 @@ export class ConversationHeader extends React.Component<Props> {
       timerOptions,
       onBlockUser,
       onUnblockUser,
-      hasNickname,
-      onClearNickname,
-      onChangeNickname,
+      // hasNickname,
+      // onClearNickname,
+      // onChangeNickname,
+      isFriend,
     } = this.props;
 
     if (isPublic || isRss) {
@@ -452,7 +454,7 @@ export class ConversationHeader extends React.Component<Props> {
     const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
     const blockHandler = isBlocked ? onUnblockUser : onBlockUser;
 
-    const disappearingMessagesMenuItem = (
+    const disappearingMessagesMenuItem = isFriend && (
       <SubMenu title={disappearingTitle}>
         {(timerOptions || []).map(item => (
           <MenuItem
@@ -475,21 +477,22 @@ export class ConversationHeader extends React.Component<Props> {
           {i18n('showSafetyNumber')}
         </MenuItem>
       );
-    const resetSessionMenuItem = !isGroup && (
-      <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
-    );
-    const blockHandlerMenuItem = !isMe &&
-      !isGroup &&
-      !isRss && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
-    const changeNicknameMenuItem = !isMe &&
+    const resetSessionMenuItem = isFriend &&
       !isGroup && (
-        <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
+        <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
       );
-    const clearNicknameMenuItem = !isMe &&
+    const blockHandlerMenuItem = !isMe &&
       !isGroup &&
-      hasNickname && (
-        <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
-      );
+      !isRss && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
+    // const changeNicknameMenuItem = !isMe &&
+    //   !isGroup && (
+    //     <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
+    //   );
+    // const clearNicknameMenuItem = !isMe &&
+    //   !isGroup &&
+    //   hasNickname && (
+    //     <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
+    //   );
     const archiveConversationMenuItem = isArchived ? (
       <MenuItem onClick={onMoveToInbox}>
         {i18n('moveConversationToInbox')}
@@ -506,8 +509,8 @@ export class ConversationHeader extends React.Component<Props> {
         {showSafetyNumberMenuItem}
         {resetSessionMenuItem}
         {blockHandlerMenuItem}
-        {changeNicknameMenuItem}
-        {clearNicknameMenuItem}
+        {/* {changeNicknameMenuItem}
+        {clearNicknameMenuItem} */}
         {archiveConversationMenuItem}
       </React.Fragment>
     );