diff --git a/.gitignore b/.gitignore
index 21dc8e534..13bcf403e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ client_secret.json
 **.bin
 **.tar.gz
 /app/mailsync.dSYM
+.idea
diff --git a/app/internal_packages/message-list/lib/message-controls.tsx b/app/internal_packages/message-list/lib/message-controls.tsx
index 76ccab596..8574dcd10 100644
--- a/app/internal_packages/message-list/lib/message-controls.tsx
+++ b/app/internal_packages/message-list/lib/message-controls.tsx
@@ -41,13 +41,18 @@ export default class MessageControls extends React.Component<MessageControlsProp
       select: this._onForward,
     };
 
+    const showOriginal = {
+      name: localized('Show Original'),
+      select: this._onShowOriginal,
+    };
+
     if (!this.props.message.canReplyAll()) {
-      return [reply, forward];
+      return [reply, forward, showOriginal];
     }
     const defaultReplyType = AppEnv.config.get('core.sending.defaultReplyType');
     return defaultReplyType === 'reply-all'
-      ? [replyAll, reply, forward]
-      : [reply, replyAll, forward];
+      ? [replyAll, reply, forward, showOriginal]
+      : [reply, replyAll, forward, showOriginal];
   }
 
   _dropdownMenu(items) {