diff --git a/tests/features/imap/message/copy.feature b/tests/features/imap/message/copy.feature
index 8efe4a11..74acf442 100644
--- a/tests/features/imap/message/copy.feature
+++ b/tests/features/imap/message/copy.feature
@@ -6,9 +6,9 @@ Feature: IMAP copy messages
       | mbox  | folder |
       | label | label  |
     And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Inbox":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
     And bridge starts
     And the user logs in with username "[user:user]" and password "password"
     And user "[user:user]" finishes syncing
@@ -18,34 +18,34 @@ Feature: IMAP copy messages
     When IMAP client "1" copies the message with subject "foo" from "INBOX" to "Labels/label"
     And it succeeds
     Then IMAP client "1" sees the following messages in "INBOX":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | 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" sees the following messages in "Labels/label":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
 
   Scenario: Copy all messages to label
     When IMAP client "1" copies all messages from "INBOX" to "Labels/label"
     And it succeeds
     Then IMAP client "1" sees the following messages in "INBOX":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | 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" sees the following messages in "Labels/label":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
 
   Scenario: Copy message to folder does move
     When IMAP client "1" copies the message with subject "foo" from "INBOX" to "Folders/mbox"
     And it succeeds
     Then IMAP client "1" eventually sees the following messages in "INBOX":
-      | from              | to            | subject | unread | deleted |
-      | jane.doe@mail.com | name@[domain] | bar     | true   | true    |
+      | from              | to            | subject | unread |
+      | jane.doe@mail.com | name@[domain] | bar     | true   |
     And IMAP client "1" sees the following messages in "Folders/mbox":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | true    |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
 
   Scenario: Copy all messages to folder does move
     When IMAP client "1" copies all messages from "INBOX" to "Folders/mbox"
@@ -67,19 +67,19 @@ Feature: IMAP copy messages
 
   Scenario: Copy message from All mail moves from the original location
     Then IMAP client "1" sees the following messages in "INBOX":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
     When IMAP client "1" copies the message with subject "foo" from "All Mail" to "Folders/mbox"
     And it succeeds
     Then IMAP client "1" sees the following messages in "INBOX":
-      | from              | to                   | subject | unread | deleted |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | true    |
+      | from              | to                   | subject | unread |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
     Then IMAP client "1" sees the following messages in "All Mail":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | false   |
-      | jane.doe@mail.com | name@[domain]        | bar     | true   | false   |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |
+      | jane.doe@mail.com | name@[domain]        | bar     | true   |
     Then IMAP client "1" sees the following messages in "Folders/mbox":
-      | from              | to                   | subject | unread | deleted |
-      | john.doe@mail.com | [user:user]@[domain] | foo     | false  | true    |
+      | from              | to                   | subject | unread |
+      | john.doe@mail.com | [user:user]@[domain] | foo     | false  |