diff --git a/lib/api/messages.js b/lib/api/messages.js
index 81bba9be..a0bfe3b6 100644
--- a/lib/api/messages.js
+++ b/lib/api/messages.js
@@ -3195,7 +3195,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler) => {
                         setFlag = '\\Answered';
                         break;
                     case 'forward':
-                        setFlag = '$Forwarded';
+                        setFlag = { $each: ['\\Answered', '$Forwarded'] };
                         break;
                 }
 
diff --git a/lib/api/submit.js b/lib/api/submit.js
index 8fc49b87..ae85794c 100644
--- a/lib/api/submit.js
+++ b/lib/api/submit.js
@@ -103,7 +103,7 @@ module.exports = (db, server, messageHandler, userHandler) => {
                                 $addToSet.flags = '\\Answered';
                                 break;
                             case 'forward':
-                                $addToSet.flags = '$Forwarded';
+                                $addToSet.flags = { $each: ['\\Answered', '$Forwarded'] };
                                 break;
                         }