diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index e41f56ff2f..cd7dd91e4a 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -389,61 +389,24 @@ export default class MessageContextMenu extends React.Component {
             );
         }
 
-        if (forwardButton || quoteButton || collapseReplyThread) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group1'}>
-                    {quoteButton}
-                    {forwardButton}
-                    {collapseReplyThread}
-                </IconizedContextMenuOptionList>
-            ));
-        }
-
-        if (resendReactionsButton) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group2'}>
-                    {resendReactionsButton}
-                </IconizedContextMenuOptionList>
-            ));
-        }
-
-        if (externalURLButton || permalinkButton) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group3'}>
-                    {externalURLButton}
-                    {permalinkButton}
-                </IconizedContextMenuOptionList>
-            ));
-        }
-
-        if (reportEventButton) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group4'}>
-                    {reportEventButton}
-                </IconizedContextMenuOptionList>
-            ));
-        }
-
-        if (viewSourceButton) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group5'}>
-                    {viewSourceButton}
-                </IconizedContextMenuOptionList>
-            ));
-        }
-
-        if (pinButton || unhidePreviewButton) {
-            optionLists.push((
-                <IconizedContextMenuOptionList key={'group6'}>
-                    {pinButton}
-                    {unhidePreviewButton}
-                </IconizedContextMenuOptionList>
-            ));
-        }
+        optionLists.push((
+            <IconizedContextMenuOptionList key={'group1'}>
+                {quoteButton}
+                {forwardButton}
+                {pinButton}
+                {permalinkButton}
+                {reportEventButton}
+                {externalURLButton}
+                {viewSourceButton}
+                {unhidePreviewButton}
+                {resendReactionsButton}
+                {collapseReplyThread}
+            </IconizedContextMenuOptionList>
+        ));
 
         if (redactButton) {
             optionLists.push((
-                <IconizedContextMenuOptionList key={'group7'} red>
+                <IconizedContextMenuOptionList key={'group2'} red>
                     {redactButton}
                 </IconizedContextMenuOptionList>
             ));
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index faff21c2dd..f95caeff71 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2252,7 +2252,7 @@
     "Sending": "Sending",
     "Sent": "Sent",
     "Open link": "Open link",
-    "Forward message": "Forward message",
+    "Forward": "Forward",
     "Message preview": "Message preview",
     "Search for rooms or people": "Search for rooms or people",
     "Confirm abort of host creation": "Confirm abort of host creation",