diff --git a/tests/features/imap/message/move.feature b/tests/features/imap/message/move.feature
index 1434930f..b110842b 100644
--- a/tests/features/imap/message/move.feature
+++ b/tests/features/imap/message/move.feature
@@ -61,13 +61,13 @@ Feature: IMAP move messages
       | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
     And IMAP client "1" eventually sees 0 messages in "Labels/label2"
 
-   Scenario: Move message from label to label
-     When IMAP client "1" moves the message with subject "baz" from "Labels/label2" to "Labels/label"
-     And it succeeds
-     And IMAP client "1" eventually sees the following messages in "Labels/label":
-       | from              | to                   | subject | unread |
-       | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
-     And IMAP client "1" eventually sees 0 messages in "Labels/label2"
+  Scenario: Move message from label to label
+    When IMAP client "1" moves the message with subject "baz" from "Labels/label2" to "Labels/label"
+    And it succeeds
+    And IMAP client "1" eventually sees the following messages in "Labels/label":
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
+    And IMAP client "1" eventually sees 0 messages in "Labels/label2"
 
   Scenario: Move message from system label to system label
     When IMAP client "1" moves the message with subject "foo" from "INBOX" to "Trash"
@@ -115,31 +115,60 @@ Feature: IMAP move messages
       | from              | to                   | subject | unread |
       | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
 
-   Scenario: Move message from All Mail is not possible
-     When IMAP client "1" moves the message with subject "baz" from "All Mail" to "Folders/folder"
-     Then it fails
-     And IMAP client "1" eventually sees the following messages in "All Mail":
-       | from              | to                   | subject | unread |
-       | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
-       | jane.doe@mail.com | name@[domain]        | bar     | true   |
-       | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
-       | john.doe@mail.com | [user:user]@[domain] | bax     | false  |
-       | john.doe@mail.com | [user:user]@[domain] | sch     | false  |
+  Scenario: Move message from All Mail is not possible
+    When IMAP client "1" moves the message with subject "baz" from "All Mail" to "Folders/folder"
+    Then it fails
+    And IMAP client "1" eventually sees the following messages in "All Mail":
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
+      | john.doe@mail.com | [user:user]@[domain] | baz     | false  |
+      | john.doe@mail.com | [user:user]@[domain] | bax     | false  |
+      | john.doe@mail.com | [user:user]@[domain] | sch     | false  |
 
   Scenario: Move message from Scheduled is not possible
     Given test skips reporter checks
     When IMAP client "1" moves the message with subject "sch" from "Scheduled" to "Inbox"
     Then it fails
     And IMAP client "1" eventually sees the following messages in "Scheduled":
-       | from              | to                   | subject | unread |
-       | john.doe@mail.com | [user:user]@[domain] | sch     | false  |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | sch     | false  |
 
   Scenario: Move message from Inbox to Sent is not possible
-     Given test skips reporter checks
-     When IMAP client "1" moves the message with subject "bar" from "Inbox" to "Sent"
-     Then it fails
+    Given test skips reporter checks
+    When IMAP client "1" moves the message with subject "bar" from "Inbox" to "Sent"
+    Then it fails
 
-   Scenario: Move message from Sent to Inbox is not possible
-     Given test skips reporter checks
-     When IMAP client "1" moves the message with subject "bax" from "Sent" to "Inbox"
-     Then it fails
+  Scenario: Move message from Sent to Inbox is not possible
+    Given test skips reporter checks
+    When IMAP client "1" moves the message with subject "bax" from "Sent" to "Inbox"
+    Then it fails
+
+  @regression
+  Scenario: Move message from Inbox to Archive
+    When IMAP client "1" moves the message with subject "foo" from "Inbox" to "Archive"
+    And it succeeds
+    Then IMAP client "1" eventually sees the following messages in "Archive":
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Inbox":
+      | from              | to            | subject | unread |
+      | john.doe@mail.com | name@[domain] | bar     | true   |
+
+  @regression
+  Scenario: Move message from Inbox to Spam and back
+    When IMAP client "1" moves the message with subject "foo" from "Inbox" to "Spam"
+    And it succeeds
+    Then IMAP client "1" eventually sees the following messages in "Spam":
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Inbox":
+      | from              | to            | subject | unread |
+      | john.doe@mail.com | name@[domain] | bar     | true   |
+    When IMAP client "1" moves the message with subject "foo" from "Spam" to "Inbox"
+    And it succeeds
+    Then IMAP client "1" eventually sees the following messages in "Inbox":
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
+    And IMAP client "1" eventually sees 0 messages in "Spam"