From ffdd89290e0f499618b6c48a01e1424bc9c2fe08 Mon Sep 17 00:00:00 2001
From: Tung Tran <vttran@linagora.com>
Date: Sun, 14 Apr 2024 09:52:02 +0700
Subject: [PATCH] JAMES-4025 Drop artifact
 james-server-jmap-draft-integration-testing

---
 code-coverage-report/pom.xml                  |   17 -
 pom.xml                                       |   11 -
 server/apps/cassandra-app/pom.xml             |    6 -
 .../src/test/resources/eml/htmlMail.eml       |  162 +-
 server/apps/distributed-app/pom.xml           |    6 -
 server/apps/distributed-pop3-app/pom.xml      |    6 -
 server/pom.xml                                |    1 -
 .../pom.xml                                   |  162 -
 .../jmap/AllowAuthenticationStrategy.java     |   55 -
 .../org/apache/james/jmap/ContainerTest.java  |   57 -
 .../jmap/DenyAuthenticationStrategy.java      |   43 -
 .../jmap/FixedDateZonedDateTimeProvider.java  |   39 -
 .../james/jmap/JMAPAuthenticationTest.java    |  520 --
 .../org/apache/james/jmap/JmapURIBuilder.java |   32 -
 .../apache/james/jmap/MessageAppender.java    |   57 -
 .../apache/james/jmap/MockSmtpTestRule.java   |   74 -
 ...zeJmapDraftAuthenticationStrategyTest.java |  209 -
 .../apache/james/jmap/ProvisioningTest.java   |  118 -
 .../apache/james/jmap/UserCredentials.java    |   66 -
 .../james/jmap/VacationIntegrationTest.java   |  437 --
 .../jmap/VacationRelayIntegrationTest.java    |  132 -
 .../james/jmap/categories/BasicFeature.java   |   27 -
 .../CassandraAndOpenSearchCategory.java       |   27 -
 .../james/jmap/categories/EnableCucumber.java |   27 -
 .../integration/CorsHeaderAPITest.java        |   83 -
 .../draft/methods/integration/FilterTest.java | 2449 -------
 .../integration/GetMailboxesMethodTest.java   |  916 ---
 .../integration/GetMessageListMethodTest.java | 2454 -------
 .../integration/GetVacationResponseTest.java  |  268 -
 .../methods/integration/QuotaMailingTest.java |  189 -
 .../integration/SendMDNMethodTest.java        |  446 --
 .../integration/SetMailboxesMethodTest.java   | 2439 -------
 .../SetMessagesMethodReRoutingTest.java       |  241 -
 .../integration/SetMessagesMethodTest.java    | 6320 -----------------
 .../SetMessagesOutboxFlagUpdateTest.java      |  208 -
 .../integration/SetVacationResponseTest.java  |  427 --
 .../integration/cucumber/ContentType.java     |   49 -
 .../cucumber/DownloadStepdefs.java            |  528 --
 .../cucumber/GetMailboxesMethodStepdefs.java  |  147 -
 .../GetMessageListMethodStepdefs.java         |  133 -
 .../cucumber/GetMessagesMethodStepdefs.java   |  770 --
 .../integration/cucumber/HttpClient.java      |   58 -
 .../integration/cucumber/ImapStepdefs.java    |  153 -
 .../integration/cucumber/MainStepdefs.java    |   87 -
 .../cucumber/MessageIdStepdefs.java           |   49 -
 .../cucumber/SetMailboxesMethodStepdefs.java  |  342 -
 .../cucumber/SetMessagesMethodStepdefs.java   |  332 -
 .../cucumber/StringListToFlags.java           |   61 -
 .../cucumber/StringListToFlagsTest.java       |   81 -
 .../integration/cucumber/UploadStepdefs.java  |  231 -
 .../integration/cucumber/UserStepdefs.java    |  137 -
 .../cucumber/util/BooleanFromString.java      |   34 -
 .../cucumber/util/IntegerFromString.java      |   35 -
 .../cucumber/util/ObjectFromString.java       |   27 -
 .../util/ObjectFromStringExtractor.java       |   41 -
 .../cucumber/util/StringFromString.java       |   35 -
 .../integration/cucumber/util/TableRow.java   |   50 -
 .../attachment/nonIndexableAttachment.html    |  827 ---
 .../cucumber/DownloadEndpoint.feature         |  100 -
 .../resources/cucumber/DownloadGet.feature    |   99 -
 .../resources/cucumber/DownloadPost.feature   |   43 -
 .../resources/cucumber/GetMessages.feature    |  444 --
 .../cucumber/ImapKeywordsConsistency.feature  |  138 -
 ...sagesMailboxesUpdatesCompatibility.feature |   67 -
 .../cucumber/MailboxModification.feature      |   41 -
 .../resources/cucumber/SetMessages.feature    |  111 -
 .../resources/cucumber/UploadEndpoint.feature |   66 -
 .../cucumber/sharing/CopyAndSharing.feature   |   58 -
 .../sharing/DownloadAndSharing.feature        |   43 -
 .../sharing/GetMessageAndSharing.feature      |   49 -
 .../sharing/GetMessageListAndSharing.feature  |   60 -
 ...ordsConsistencyOnDelegationMailbox.feature |  140 -
 .../sharing/MailboxCreationAndSharing.feature |   40 -
 .../sharing/MailboxDeletionAndSharing.feature |   36 -
 .../sharing/MoveMailboxAndSharing.feature     |   77 -
 .../sharing/MoveMessageAndSharing.feature     |  149 -
 .../sharing/RenamingMailboxAndSharing.feature |   49 -
 .../sharing/SetFlagAndSharing.feature         |   62 -
 .../SetMessagesOnSharedMailbox.feature        |  112 -
 ...haringChildrenWithoutSharingParent.feature |   42 -
 .../SharingMailboxWithOtherDomain.feature     |   31 -
 ...arentMailboxWithAndWithoutChildren.feature |  112 -
 .../src/test/resources/eml/attachment.pdf     |  Bin 9404 -> 0 bytes
 .../src/test/resources/eml/calendar.eml       |   42 -
 ...eddedMultipartWithInlineTextAttachment.eml |   42 -
 .../htmlAndTextMultipartWithOneAttachment.eml |   64 -
 .../eml/htmlBodyWithManyEmptyTags.eml         |  105 -
 .../eml/htmlWithLongAndComplicatedContent.eml | 1995 ------
 .../src/test/resources/eml/ics_in_header.eml  |   46 -
 .../test/resources/eml/inlinedMultipart.eml   |   36 -
 .../eml/inlinedWithoutContentDisposition.eml  |   69 -
 .../resources/eml/inlinedWithoutContentID.eml |   60 -
 .../src/test/resources/eml/longLine.eml       |    1 -
 .../mailWithInlinedAttachmentAndBlankCid.eml  |   74 -
 .../eml/mailWithInlinedAttachmentButNoCid.eml |   72 -
 .../test/resources/eml/mailWithRecipients.eml |   14 -
 .../test/resources/eml/multipartRelated.eml   |   38 -
 .../resources/eml/noTextBodyButHtmlBody.eml   |   84 -
 .../resources/eml/oneAttachment-part1.eml     |   30 -
 .../resources/eml/oneAttachment-part2.eml     |    9 -
 .../src/test/resources/eml/oneAttachment.eml  |   38 -
 .../test/resources/eml/oneInlinedImage.eml    |   82 -
 ...eInlinedImageWithoutContentDisposition.eml |   72 -
 .../test/resources/eml/sameInlinedImages.eml  |   84 -
 ...extInMainMultipartHtmlInInnerMultipart.eml |   43 -
 .../src/test/resources/eml/twoAttachments.eml |   74 -
 .../resources/eml/twoAttachmentsTextPlain.eml |   73 -
 .../test/resources/eml/twoSameAttachments.eml |   77 -
 .../test/resources/eml/windows1252charset.eml |   43 -
 .../pom.xml                                   |  176 -
 .../jmap/memory/MemoryCorsHeaderAPITest.java  |   37 -
 .../james/jmap/memory/MemoryFilterTest.java   |   47 -
 .../memory/MemoryGetMailboxesMethodTest.java  |   39 -
 .../MemoryGetMessageListMethodTest.java       |   64 -
 .../MemoryGetVacationResponseMethodTest.java  |   39 -
 .../memory/MemoryJmapAuthenticationTest.java  |   41 -
 ...zeJmapDraftAuthenticationStrategyTest.java |   46 -
 .../jmap/memory/MemoryProvisioningTest.java   |   37 -
 .../jmap/memory/MemoryQuotaMailingTest.java   |   38 -
 .../jmap/memory/MemorySendMDNMethodTest.java  |   52 -
 .../memory/MemorySetMailboxesMethodTest.java  |   37 -
 .../MemorySetMessagesMethodReRoutingTest.java |   37 -
 .../memory/MemorySetMessagesMethodTest.java   |   45 -
 ...MemorySetMessagesOutboxFlagUpdateTest.java |   57 -
 .../MemorySetVacationResponseMethodTest.java  |   37 -
 .../memory/MemoryVacationIntegrationTest.java |   37 -
 .../MemoryVacationRelayIntegrationTest.java   |   47 -
 .../MemoryDownloadEnpointCucumberTest.java    |   36 -
 .../MemoryDownloadGetCucumberTest.java        |   36 -
 .../MemoryDownloadPostCucumberTest.java       |   36 -
 .../cucumber/MemoryGetMessagesMethodTest.java |   36 -
 ...MemoryIMAPKeywordsInconsistenciesTest.java |   36 -
 ...emoryIMAPSetMessagesCompatibilityTest.java |   36 -
 .../MemorySetMailboxesMethodCucumberTest.java |   36 -
 .../MemorySetMessagesMethodCucumberTest.java  |   36 -
 .../memory/cucumber/MemorySharingTest.java    |   36 -
 .../jmap/memory/cucumber/MemoryStepdefs.java  |   75 -
 .../cucumber/MemoryUploadCucumberTest.java    |   36 -
 .../src/test/resources/dnsservice.xml         |   25 -
 .../src/test/resources/domainlist.xml         |   24 -
 .../src/test/resources/imapserver.xml         |   41 -
 .../src/test/resources/keystore               |  Bin 2245 -> 0 bytes
 .../src/test/resources/listeners.xml          |   50 -
 .../src/test/resources/lmtpserver.xml         |   23 -
 .../src/test/resources/mailetcontainer.xml    |  127 -
 .../test/resources/mailrepositorystore.xml    |   30 -
 .../src/test/resources/managesieveserver.xml  |   32 -
 .../src/test/resources/pop3server.xml         |   23 -
 .../src/test/resources/smtpserver.xml         |   53 -
 .../src/test/resources/usersrepository.xml    |   25 -
 .../jmap-draft-integration-testing/pom.xml    |   50 -
 .../pom.xml                                   |  193 -
 .../rabbitmq/RabbitMQAwsS3FilterTest.java     |   50 -
 .../RabbitMQAwsS3GetMailboxesMethodTest.java  |   44 -
 ...RabbitMQAwsS3GetMessageListMethodTest.java |   55 -
 .../RabbitMQAwsS3GetVacationResponseTest.java |   44 -
 .../RabbitMQAwsS3JmapAuthenticationTest.java  |   49 -
 .../RabbitMQAwsS3ProvisioningTest.java        |   44 -
 .../RabbitMQAwsS3QuotaMailingTest.java        |   42 -
 .../RabbitMQAwsS3SendMDNMethodTest.java       |   66 -
 .../RabbitMQAwsS3SetMailboxesMethodTest.java  |   45 -
 ...MQAwsS3SetMessagesMethodReRoutingTest.java |   42 -
 .../RabbitMQAwsS3SetMessagesMethodTest.java   |   59 -
 .../RabbitMQAwsS3SetVacationResponseTest.java |   43 -
 .../RabbitMQAwsS3VacationIntegrationTest.java |   43 -
 ...itMQAwsS3VacationRelayIntegrationTest.java |   54 -
 .../src/test/resources/dnsservice.xml         |   25 -
 .../src/test/resources/domainlist.xml         |   24 -
 .../src/test/resources/imapserver.xml         |   57 -
 .../src/test/resources/keystore               |  Bin 2245 -> 0 bytes
 .../src/test/resources/listeners.xml          |   53 -
 .../src/test/resources/lmtpserver.xml         |   42 -
 .../src/test/resources/mailetcontainer.xml    |  126 -
 .../test/resources/mailrepositorystore.xml    |   30 -
 .../src/test/resources/pop3server.xml         |   43 -
 .../src/test/resources/smtpserver.xml         |  109 -
 176 files changed, 81 insertions(+), 31626 deletions(-)
 rename server/{protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common => apps/cassandra-app}/src/test/resources/eml/htmlMail.eml (98%)
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/AllowAuthenticationStrategy.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/DenyAuthenticationStrategy.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/FixedDateZonedDateTimeProvider.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MockSmtpTestRule.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/UserCredentials.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/BasicFeature.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/EnableCucumber.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ContentType.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessageListMethodStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/HttpClient.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ImapStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MessageIdStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMessagesMethodStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlags.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlagsTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/BooleanFromString.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/IntegerFromString.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromString.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromStringExtractor.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/StringFromString.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/TableRow.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/attachment/nonIndexableAttachment.html
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadEndpoint.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadGet.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadPost.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapKeywordsConsistency.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/MailboxModification.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/SetMessages.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/UploadEndpoint.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/CopyAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/DownloadAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageListAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/KeywordsConsistencyOnDelegationMailbox.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxCreationAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxDeletionAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMailboxAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMessageAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/RenamingMailboxAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetFlagAndSharing.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetMessagesOnSharedMailbox.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingChildrenWithoutSharingParent.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingMailboxWithOtherDomain.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingParentMailboxWithAndWithoutChildren.feature
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/attachment.pdf
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/calendar.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/embeddedMultipartWithInlineTextAttachment.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlAndTextMultipartWithOneAttachment.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlBodyWithManyEmptyTags.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlWithLongAndComplicatedContent.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/ics_in_header.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedMultipart.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentDisposition.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentID.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/longLine.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentAndBlankCid.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentButNoCid.eml
 delete mode 100755 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithRecipients.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/multipartRelated.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/noTextBodyButHtmlBody.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part1.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part2.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImage.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImageWithoutContentDisposition.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/sameInlinedImages.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/textInMainMultipartHtmlInInnerMultipart.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachments.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachmentsTextPlain.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoSameAttachments.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/windows1252charset.eml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryCorsHeaderAPITest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFilterTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryModularizeJmapDraftAuthenticationStrategyTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryQuotaMailingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesOutboxFlagUpdateTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadEnpointCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadGetCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadPostCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryGetMessagesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPKeywordsInconsistenciesTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPSetMessagesCompatibilityTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMailboxesMethodCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMessagesMethodCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryUploadCucumberTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/domainlist.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/keystore
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/listeners.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/managesieveserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/pop3server.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/usersrepository.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/pom.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3FilterTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3JmapAuthenticationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3ProvisioningTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3QuotaMailingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/domainlist.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/keystore
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/listeners.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
 delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml

diff --git a/code-coverage-report/pom.xml b/code-coverage-report/pom.xml
index b808f05ab12..da19e4c0e3f 100644
--- a/code-coverage-report/pom.xml
+++ b/code-coverage-report/pom.xml
@@ -882,23 +882,6 @@
             <artifactId>james-server-jmap</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--        jmap-draft-integration-testing module-->
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>memory-jmap-draft-integration-testing</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>rabbitmq-jmap-draft-integration-testing</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!--        end of jmap-draft-integration-testing module-->
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-jmap-rfc-8621</artifactId>
diff --git a/pom.xml b/pom.xml
index 1113e01547b..8ba38345c40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1567,17 +1567,6 @@
                 <artifactId>james-server-jmap-draft</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${james.groupId}</groupId>
-                <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${james.groupId}</groupId>
-                <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-            </dependency>
             <dependency>
                 <groupId>${james.groupId}</groupId>
                 <artifactId>james-server-jmap-rfc-8621</artifactId>
diff --git a/server/apps/cassandra-app/pom.xml b/server/apps/cassandra-app/pom.xml
index 4db4acd599a..4fc6e1487e1 100644
--- a/server/apps/cassandra-app/pom.xml
+++ b/server/apps/cassandra-app/pom.xml
@@ -207,12 +207,6 @@
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-guice-webadmin-mailrepository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId>
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlMail.eml b/server/apps/cassandra-app/src/test/resources/eml/htmlMail.eml
similarity index 98%
rename from server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlMail.eml
rename to server/apps/cassandra-app/src/test/resources/eml/htmlMail.eml
index ba2da77ea4a..c8213f4d7ea 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlMail.eml
+++ b/server/apps/cassandra-app/src/test/resources/eml/htmlMail.eml
@@ -1,81 +1,81 @@
-Delivered-To: mister@james.org
-Received: by 10.28.170.202 with SMTP id t193csp327634wme;
-        Thu, 4 Jun 2015 00:36:15 -0700 (PDT)
-X-Received: by 10.180.77.195 with SMTP id u3mr5042880wiw.30.1433403375307;
-        Thu, 04 Jun 2015 00:36:15 -0700 (PDT)
-Return-Path: <bounces+1453977-062b-mister=james.org@email.airbnb.com>
-Received: from o7.email.airbnb.com (o7.email.airbnb.com. [167.89.32.249])
-        by mx.google.com with ESMTPS id i2si5691730wjz.123.2015.06.04.00.36.13
-        for <mister@james.org>
-        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Thu, 04 Jun 2015 00:36:15 -0700 (PDT)
-Received-SPF: pass (google.com: domain of bounces+1453977-062b-mister=james.org@email.airbnb.com designates 167.89.32.249 as permitted sender) client-ip=167.89.32.249;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: domain of bounces+1453977-062b-mister=james.org@email.airbnb.com designates 167.89.32.249 as permitted sender) smtp.mail=bounces+1453977-062b-mister=james.org@email.airbnb.com;
-       dkim=pass header.i=@email.airbnb.com;
-       dmarc=pass (p=REJECT dis=NONE) header.from=airbnb.com
-DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=email.airbnb.com;
-	h=from:to:subject:mime-version:content-type:content-transfer-encoding;
-	s=s20150428; bh=2mhWUwzjtQTC0KljgpaEsuvrqok=; b=EhC2QHKb5+63egDD
-	qDCAepUELCeUZXCkw8+31kGT+O1va3iAKvQSAvzXJ3qJlIL9FgdeFk8sR78Vszn/
-	A73vp6NGjAW60M4gUZjxEOIPzGKIS95KfmHxg10fXUOFW0uePojNEg4ZPCcuitrZ
-	HuWvzHK5I2siGnqupiivwxDgs5c=
-DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.info;
-	h=from:to:subject:mime-version:content-type:content-transfer-encoding:x-feedback-id;
-	s=smtpapi; bh=2mhWUwzjtQTC0KljgpaEsuvrqok=; b=FPiYMmNJLCrL2e8v/0
-	DQC4voofe8nuuE7rhXZ25oqNAhAQja4oKIysJ1qAME2aEaqh+N5aJlCEuHrSG/7+
-	NAQ0OY8KaJ2zlnxAbmgJETOjnf4oGdAa+nU/nVVEPfN2NRcBCNLGQZ80U4T5k8Xi
-	PakIuZvKDTRq7PiosSCSHT/FQ=
-Received: by filter0490p1mdw1.sendgrid.net with SMTP id filter0490p1mdw1.13271.556FFFE7B
-        2015-06-04 07:36:09.249601779 +0000 UTC
-Received: from i-dee0850e.inst.aws.airbnb.com (ec2-54-90-154-187.compute-1.amazonaws.com [54.90.154.187])
-	by ismtpd-017 (SG) with ESMTP id 14dbd7fa6b4.779a.254b43
-	for <mister@james.org>; Thu, 04 Jun 2015 07:36:09 +0000 (UTC)
-Received: by i-dee0850e.inst.aws.airbnb.com (Postfix, from userid 1041)
-	id 19CBA24C60; Thu,  4 Jun 2015 07:36:09 +0000 (UTC)
-Date: Thu, 04 Jun 2015 07:36:08 +0000
-From: Airbnb <discover@airbnb.com>
-To: mister@james.org
-Message-ID: <556fffe8cac78_7ed0e0fe204457be@i-dee0850e.mail>
-Subject: Text and Html not similar
-Mime-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="--==_mimepart_556fffe8c7e84_7ed0e0fe20445637";
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-X-User-ID: 32692788
-X-Locale: fr
-X-Category: engagement
-X-Template: low_intent_top_destinations
-recipients:
-sent-on:
-X-SG-EID: mgVKhb3i1xMIKbRk82EYOUTMOPmiNk6g5BaWGQQKDTQchtClhw7VcIxig2BMwy1QMCr7h56hNVush8
- 4aRV0ieMn+WZ1XVnpY0OcmMYNZnuuvlOoNkBaiuiqeWuKVZO9c9S5OyxPy7WQeI0mccenq35NpLqjI
- nQt7IAl2sIUksUD4lM8Ai0u2C88YW13cL+Lo
-X-SG-ID: pQ7zy0fBcyQB3Gm22dZtqT6AR3zbAquH5ABZFkQfSKaxWRhz0YhtD36Li5uybRUjnPsuB21NpreKvG
- t8iQBUn2ygs6hx6sMcgyI7L7bAY28p14Qj47KqA3JXbtMa0Xa3wdZaUUjZpemCg078XxMM5VaSHdDO
- ChUhSV+z9RAJ38wAdUfXkpbO+m97vpU+mtWzVBoOrSiWCVYoNxPhvE4yIQ==
-X-Feedback-ID: 1453977:N5+DXWRfRBXSDDbqVYXPNg8MjWYWwZibliGo1i/oSqY=:Ibl/atjs+SOcHCINmWWv/YvIGzDUihUrks9jdHsNF1+pafkc987UhcxmuyggxNgdCkEmMZDb9gJcndcUJy5KOw==:SG
-
-----==_mimepart_556fffe8c7e84_7ed0e0fe20445637
-Content-Type: text/plain;
- charset=UTF-8
-Content-Transfer-Encoding: quoted-printable
-
-The text/plain part is not matching the html one.
-
-----==_mimepart_556fffe8c7e84_7ed0e0fe20445637
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 7bit
-
-<html>
-  <head>
-
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  </head>
-  <body bgcolor="#FFFFFF" text="#000000">
-    <i>This is a mail with <b>beautifull</b> html content which contains a banana.</i><br>
-  </body>
-</html>
-
-----==_mimepart_556fffe8c7e84_7ed0e0fe20445637--
+Delivered-To: mister@james.org
+Received: by 10.28.170.202 with SMTP id t193csp327634wme;
+        Thu, 4 Jun 2015 00:36:15 -0700 (PDT)
+X-Received: by 10.180.77.195 with SMTP id u3mr5042880wiw.30.1433403375307;
+        Thu, 04 Jun 2015 00:36:15 -0700 (PDT)
+Return-Path: <bounces+1453977-062b-mister=james.org@email.airbnb.com>
+Received: from o7.email.airbnb.com (o7.email.airbnb.com. [167.89.32.249])
+        by mx.google.com with ESMTPS id i2si5691730wjz.123.2015.06.04.00.36.13
+        for <mister@james.org>
+        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+        Thu, 04 Jun 2015 00:36:15 -0700 (PDT)
+Received-SPF: pass (google.com: domain of bounces+1453977-062b-mister=james.org@email.airbnb.com designates 167.89.32.249 as permitted sender) client-ip=167.89.32.249;
+Authentication-Results: mx.google.com;
+       spf=pass (google.com: domain of bounces+1453977-062b-mister=james.org@email.airbnb.com designates 167.89.32.249 as permitted sender) smtp.mail=bounces+1453977-062b-mister=james.org@email.airbnb.com;
+       dkim=pass header.i=@email.airbnb.com;
+       dmarc=pass (p=REJECT dis=NONE) header.from=airbnb.com
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=email.airbnb.com;
+	h=from:to:subject:mime-version:content-type:content-transfer-encoding;
+	s=s20150428; bh=2mhWUwzjtQTC0KljgpaEsuvrqok=; b=EhC2QHKb5+63egDD
+	qDCAepUELCeUZXCkw8+31kGT+O1va3iAKvQSAvzXJ3qJlIL9FgdeFk8sR78Vszn/
+	A73vp6NGjAW60M4gUZjxEOIPzGKIS95KfmHxg10fXUOFW0uePojNEg4ZPCcuitrZ
+	HuWvzHK5I2siGnqupiivwxDgs5c=
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.info;
+	h=from:to:subject:mime-version:content-type:content-transfer-encoding:x-feedback-id;
+	s=smtpapi; bh=2mhWUwzjtQTC0KljgpaEsuvrqok=; b=FPiYMmNJLCrL2e8v/0
+	DQC4voofe8nuuE7rhXZ25oqNAhAQja4oKIysJ1qAME2aEaqh+N5aJlCEuHrSG/7+
+	NAQ0OY8KaJ2zlnxAbmgJETOjnf4oGdAa+nU/nVVEPfN2NRcBCNLGQZ80U4T5k8Xi
+	PakIuZvKDTRq7PiosSCSHT/FQ=
+Received: by filter0490p1mdw1.sendgrid.net with SMTP id filter0490p1mdw1.13271.556FFFE7B
+        2015-06-04 07:36:09.249601779 +0000 UTC
+Received: from i-dee0850e.inst.aws.airbnb.com (ec2-54-90-154-187.compute-1.amazonaws.com [54.90.154.187])
+	by ismtpd-017 (SG) with ESMTP id 14dbd7fa6b4.779a.254b43
+	for <mister@james.org>; Thu, 04 Jun 2015 07:36:09 +0000 (UTC)
+Received: by i-dee0850e.inst.aws.airbnb.com (Postfix, from userid 1041)
+	id 19CBA24C60; Thu,  4 Jun 2015 07:36:09 +0000 (UTC)
+Date: Thu, 04 Jun 2015 07:36:08 +0000
+From: Airbnb <discover@airbnb.com>
+To: mister@james.org
+Message-ID: <556fffe8cac78_7ed0e0fe204457be@i-dee0850e.mail>
+Subject: Text and Html not similar
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="--==_mimepart_556fffe8c7e84_7ed0e0fe20445637";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+X-User-ID: 32692788
+X-Locale: fr
+X-Category: engagement
+X-Template: low_intent_top_destinations
+recipients:
+sent-on:
+X-SG-EID: mgVKhb3i1xMIKbRk82EYOUTMOPmiNk6g5BaWGQQKDTQchtClhw7VcIxig2BMwy1QMCr7h56hNVush8
+ 4aRV0ieMn+WZ1XVnpY0OcmMYNZnuuvlOoNkBaiuiqeWuKVZO9c9S5OyxPy7WQeI0mccenq35NpLqjI
+ nQt7IAl2sIUksUD4lM8Ai0u2C88YW13cL+Lo
+X-SG-ID: pQ7zy0fBcyQB3Gm22dZtqT6AR3zbAquH5ABZFkQfSKaxWRhz0YhtD36Li5uybRUjnPsuB21NpreKvG
+ t8iQBUn2ygs6hx6sMcgyI7L7bAY28p14Qj47KqA3JXbtMa0Xa3wdZaUUjZpemCg078XxMM5VaSHdDO
+ ChUhSV+z9RAJ38wAdUfXkpbO+m97vpU+mtWzVBoOrSiWCVYoNxPhvE4yIQ==
+X-Feedback-ID: 1453977:N5+DXWRfRBXSDDbqVYXPNg8MjWYWwZibliGo1i/oSqY=:Ibl/atjs+SOcHCINmWWv/YvIGzDUihUrks9jdHsNF1+pafkc987UhcxmuyggxNgdCkEmMZDb9gJcndcUJy5KOw==:SG
+
+----==_mimepart_556fffe8c7e84_7ed0e0fe20445637
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+The text/plain part is not matching the html one.
+
+----==_mimepart_556fffe8c7e84_7ed0e0fe20445637
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+<html>
+  <head>
+
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <i>This is a mail with <b>beautifull</b> html content which contains a banana.</i><br>
+  </body>
+</html>
+
+----==_mimepart_556fffe8c7e84_7ed0e0fe20445637--
diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml
index aedc1258534..22ca0cdf619 100644
--- a/server/apps/distributed-app/pom.xml
+++ b/server/apps/distributed-app/pom.xml
@@ -252,12 +252,6 @@
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-guice-webadmin-mailrepository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId>
diff --git a/server/apps/distributed-pop3-app/pom.xml b/server/apps/distributed-pop3-app/pom.xml
index c5e4d9a949e..27db13416cc 100644
--- a/server/apps/distributed-pop3-app/pom.xml
+++ b/server/apps/distributed-pop3-app/pom.xml
@@ -245,12 +245,6 @@
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-guice-webadmin-mailrepository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index cb66d8fa536..5bfb6f8c587 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -95,7 +95,6 @@
         <module>protocols/fetchmail</module>
         <module>protocols/jmap</module>
         <module>protocols/jmap-draft</module>
-        <module>protocols/jmap-draft-integration-testing</module>
         <module>protocols/jmap-rfc-8621</module>
         <module>protocols/jmap-rfc-8621-integration-tests</module>
         <module>protocols/jwt</module>
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
deleted file mode 100644
index a2153d041d1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.james</groupId>
-        <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache James :: Server :: JMAP (draft) :: Integration testing Common</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-mailbox-api</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>backup</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-data-jmap</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-dnsservice-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-common</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-common</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-imap</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-jmap</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-mailbox</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-smtp</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-webadmin</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-mailets</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>mock-smtp-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>testing-base</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-guice</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.javacrumbs.json-unit</groupId>
-            <artifactId>json-unit-assertj</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/AllowAuthenticationStrategy.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/AllowAuthenticationStrategy.java
deleted file mode 100644
index 8e77e3aa393..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/AllowAuthenticationStrategy.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import static org.apache.james.jmap.ModularizeJmapDraftAuthenticationStrategyTest.BOB;
-
-import jakarta.inject.Inject;
-
-import org.apache.james.jmap.http.AuthenticationChallenge;
-import org.apache.james.jmap.http.AuthenticationScheme;
-import org.apache.james.jmap.http.AuthenticationStrategy;
-import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxSession;
-
-import com.google.common.collect.ImmutableMap;
-
-import reactor.core.publisher.Mono;
-import reactor.netty.http.server.HttpServerRequest;
-
-public class AllowAuthenticationStrategy implements AuthenticationStrategy {
-    private final MailboxManager mailboxManager;
-
-    @Inject
-    public AllowAuthenticationStrategy(MailboxManager mailboxManager) {
-        this.mailboxManager = mailboxManager;
-    }
-
-    @Override
-    public Mono<MailboxSession> createMailboxSession(HttpServerRequest httpRequest) {
-        return Mono.fromCallable(() -> mailboxManager.authenticate(BOB).withoutDelegation());
-    }
-
-    @Override
-    public AuthenticationChallenge correspondingChallenge() {
-        return AuthenticationChallenge.of(
-            AuthenticationScheme.of("Allow Authentication Strategy"), ImmutableMap.of());
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
deleted file mode 100644
index 4225e87a1ad..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.jmap;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.http.client.fluent.Request;
-import org.apache.http.client.fluent.Response;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.james.util.docker.DockerContainer;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.RateLimiters;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-
-public class ContainerTest {
-
-    @Rule
-    public DockerContainer container = DockerContainer.fromName("nginx:1.25")
-        .withAffinityToContainer()
-        .withExposedPorts(80)
-        .waitingFor(new HttpWaitStrategy()
-            .forStatusCode(200)
-            .withRateLimiter(RateLimiters.TWENTIES_PER_SECOND));
-
-    @Test
-    public void containerShouldBeReachableOnExposedPort() throws IOException, URISyntaxException {
-        Response response = Request.Get(new URIBuilder()
-            .setScheme("http")
-            .setHost(container.getHostIp())
-            .setPort(container.getMappedPort(80)).build())
-            .execute();
-
-        assertThat(response.returnResponse().getStatusLine().getStatusCode())
-            .isEqualTo(200);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/DenyAuthenticationStrategy.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/DenyAuthenticationStrategy.java
deleted file mode 100644
index 4d94babbf67..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/DenyAuthenticationStrategy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import org.apache.james.jmap.http.AuthenticationChallenge;
-import org.apache.james.jmap.http.AuthenticationScheme;
-import org.apache.james.jmap.http.AuthenticationStrategy;
-import org.apache.james.mailbox.MailboxSession;
-
-import com.google.common.collect.ImmutableMap;
-
-import reactor.core.publisher.Mono;
-import reactor.netty.http.server.HttpServerRequest;
-
-public class DenyAuthenticationStrategy implements AuthenticationStrategy {
-    @Override
-    public Mono<MailboxSession> createMailboxSession(HttpServerRequest httpRequest) {
-        return Mono.empty();
-    }
-
-    @Override
-    public AuthenticationChallenge correspondingChallenge() {
-        return AuthenticationChallenge.of(
-            AuthenticationScheme.of("Deny Authentication Strategy"), ImmutableMap.of());
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/FixedDateZonedDateTimeProvider.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/FixedDateZonedDateTimeProvider.java
deleted file mode 100644
index fd0c24ccbe2..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/FixedDateZonedDateTimeProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import java.time.ZonedDateTime;
-
-import org.apache.james.util.date.ZonedDateTimeProvider;
-
-public class FixedDateZonedDateTimeProvider implements ZonedDateTimeProvider {
-
-    private ZonedDateTime zonedDateTime;
-
-    public void setFixedDateTime(ZonedDateTime zonedDateTime) {
-        this.zonedDateTime = zonedDateTime;
-    }
-
-    @Override
-    public ZonedDateTime get() {
-        return zonedDateTime;
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
deleted file mode 100644
index 70457f904bb..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.jmap;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.hamcrest.Matchers.both;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.isA;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.io.IOException;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.UUID;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.jmap.draft.model.ContinuationToken;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-
-public abstract class JMAPAuthenticationTest {
-
-    private static final ZonedDateTime oldDate = ZonedDateTime.parse("2011-12-03T10:15:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-    private static final ZonedDateTime newDate = ZonedDateTime.parse("2011-12-03T10:16:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-    private static final ZonedDateTime afterExpirationDate = ZonedDateTime.parse("2011-12-03T10:30:31+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-
-    protected abstract GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException;
-
-    private UserCredentials userCredentials;
-    private FixedDateZonedDateTimeProvider zonedDateTimeProvider;
-    private GuiceJamesServer jmapServer;
-
-    @Before
-    public void setup() throws Throwable {
-        zonedDateTimeProvider = new FixedDateZonedDateTimeProvider();
-        zonedDateTimeProvider.setFixedDateTime(oldDate);
-        jmapServer = createJmapServer(zonedDateTimeProvider);
-        jmapServer.start();
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        
-        userCredentials = UserCredentials.builder()
-                .username("user@domain.tld")
-                .password("password")
-                .build();
-
-        
-        String domain = "domain.tld";
-        jmapServer.getProbe(DataProbeImpl.class)
-            .fluent()
-            .addDomain(domain)
-            .addUser(userCredentials.getUsername(), userCredentials.getPassword());
-        
-    }
-    
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenContentTypeIsMissing() {
-        given()
-            .accept(ContentType.JSON)
-            .contentType("")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenContentTypeIsNotJson() {
-        given()
-            .contentType(ContentType.XML)
-            .accept(ContentType.JSON)
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenAcceptIsMissing() {
-        given()
-            .accept("")
-            .contentType(ContentType.JSON)
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenAcceptIsNotJson() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.XML)
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenCharsetIsNotUTF8() {
-        given()
-            .contentType("application/json; charset=ISO-8859-1")
-            .accept(ContentType.JSON)
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenBodyIsEmpty() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustReturnMalformedRequestWhenBodyIsNotAcceptable() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"badAttributeName\": \"value\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void mustPositionCorsHeaders() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"username\": \"" + userCredentials.getUsername() + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Blogg’s iPhone\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .header("Access-Control-Allow-Origin", "*")
-            .header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT")
-            .header("Access-Control-Allow-Headers", "Content-Type, Authorization, Accept")
-            .header("Access-Control-Max-Age", "86400");
-    }
-
-    @Test
-    public void mustReturnJsonResponse() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"username\": \"" + userCredentials.getUsername() + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Blogg’s iPhone\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(200)
-            .header("Content-Length", "447")
-            .contentType(ContentType.JSON);
-    }
-
-    @Test
-    public void methodShouldContainPasswordWhenValidRequest() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"username\": \"" + userCredentials.getUsername() + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Blogg’s iPhone\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(200)
-            .body("methods", hasItem(userCredentials.getPassword()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mustReturnContinuationTokenWhenValidRequest() {
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"username\": \"" + userCredentials.getUsername() + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Blogg’s iPhone\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(200)
-            .body("continuationToken", isA(String.class));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mustReturnAuthenticationFailedWhenBadPassword() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"badpassword\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void mustReturnAuthenticationFailedWhenContinuationTokenIsRejectedByTheContinuationTokenManager() throws Exception {
-        ContinuationToken badContinuationToken = new ContinuationToken(userCredentials.getUsername(), newDate, "badSignature");
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + badContinuationToken.serialize() + "\", \"method\": \"password\", \"password\": \"" + userCredentials.getPassword() + "\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void mustReturnRestartAuthenticationWhenContinuationTokenIsExpired() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        zonedDateTimeProvider.setFixedDateTime(afterExpirationDate);
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + userCredentials.getPassword() + "\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(403);
-    }
-
-    @Test
-    public void mustReturnAuthenticationFailedWhenUsersRepositoryException() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + "wrong password" + "\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void mustReturnCreatedWhenGoodPassword() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        zonedDateTimeProvider.setFixedDateTime(newDate);
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + userCredentials.getPassword() + "\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .statusCode(201);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mustSendJsonContainingAccessTokenAndEndpointsWhenGoodPassword() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        zonedDateTimeProvider.setFixedDateTime(newDate);
-
-        given()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + userCredentials.getPassword() + "\"}")
-        .when()
-            .post("/authentication")
-        .then()
-            .body("accessToken", isA(String.class))
-            .body("api", equalTo("/jmap"))
-            .body("eventSource", both(isA(String.class)).and(notNullValue()))
-            .body("upload", equalTo("/upload"))
-            .body("download", equalTo("/download"));
-    }
-    
-    @Test
-    public void getMustReturnUnauthorizedWithoutAuthorizationHeader() {
-        given()
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getMustReturnUnauthorizedWithoutAValidAuthorizationHeader() {
-        given()
-            .header("Authorization", UUID.randomUUID())
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMustReturnEndpointsWhenValidAuthorizationHeader() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        String token = fromGoodAccessTokenRequest(continuationToken);
-
-        given()
-            .header("Authorization", token)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200)
-            .body("api", equalTo("/jmap"))
-            .body("eventSource", both(isA(String.class)).and(notNullValue()))
-            .body("upload", equalTo("/upload"))
-            .body("download", equalTo("/download"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMustReturnEndpointsWhenValidJwtAuthorizationHeader() {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VyQGRvbWFpbi50bGQifQ.U-dUPv6OU6KO5N7CooHUfMkCd" +
-            "FJHx2F3H4fm7Q79g1BPfBSkifPj5xyVlZ0JwEGXypC4zBw9ay3l4DxzX7D_6p1Hx_ihXsoLx1Ca-WUo44x-XRSpPfgxiZjHCJkGBLMV3RZlA" +
-            "jip-d18mxkcX3JGplX_sCQkFisduAOAHuKSUg9wI6VBgUQi_0B35FYv6tP_bD6eFtvaAUN9QyXXh8UQjEp8CO12lRz6enfLx_V6BG_fEMkee" +
-            "6vRqdEqx_F9OF3eWTe1giMp_JhQ7_l1OXXtbd4TndVvTeuVy4irPbsRc-M8x_-qTDpFp6saRRsyOcFspxPp5n3yIhEK7B3UZiseXw";
-
-        given()
-            .header("Authorization", "Bearer " + token)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200);
-    }
-
-    @Test
-    public void getMustReturnEndpointsWhenValidUnknownUserJwtAuthorizationHeader() {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1bmtub3duQGRvbWFpbi50bGQifQ.hr8AhlNIpiA3Mv_A5ZLyL" +
-            "f1BHeBSaRDfdR_GLV_hlPdIrWv1xtwjBH86E1YnTPx2tTpr_NWTbHcR1OCkuVCpgloEnUNbE3U2l0WrGOX2Eh9dWCXOCtrNvCeSHQuvx5_8W" +
-            "nSVENYidk7o2icE8_gz_Giwf0Z3bHJJYXfAxupv__tCkmhqt3E888VZPjs26AsqxQ29YyX0Fjx8UwKbPrH5-tnyftX-kLjjZNtahVIVtbW4v" +
-            "b8rEEZ4nzqxHqtI2co6yCXjgyoFMdDAKCOU-Bq35Gdo-Qiu8l7a0kQGhuhkjoaVWvw4bcSvunxAnh_0W5g3Lw-rwljNu2JrJS0gAH6NDA";
-        
-        given()
-            .header("Authorization", "Bearer " + token)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200);
-    }
-
-    @Test
-    public void getMustReturnBadCredentialsWhenInvalidJwtAuthorizationHeader() {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIn0.T04BTk" +
-                "LXkJj24coSZkK13RfG25lpvmSl2MJ7N10KpBk9_-95EGYZdog-BDAn3PJzqVw52z-Bwjh4VOj1-j7cURu0cT4jXehhUrlCxS4n7QHZ" +
-                "EN_bsEYGu7KzjWTpTsUiHe-rN7izXVFxDGG1TGwlmBCBnPW-EFCf9ylUsJi0r2BKNdaaPRfMIrHptH1zJBkkUziWpBN1RNLjmvlAUf" +
-                "49t1Tbv21ZqYM5Ht2vrhJWczFbuC-TD-8zJkXhjTmA1GVgomIX5dx1cH-dZX1wANNmshUJGHgepWlPU-5VIYxPEhb219RMLJIELMY2" +
-                "qNOR8Q31ydinyqzXvCSzVJOf6T60-w";
-
-        given()
-            .header("Authorization", "Bearer " + token)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void optionsRequestsShouldNeverRequireAuthentication() {
-        given()
-        .when()
-            .options("/authentication")
-        .then()
-            .statusCode(200);
-    }
-
-    @Test
-    public void getMustReturnEndpointsWhenCorrectAuthentication() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        zonedDateTimeProvider.setFixedDateTime(newDate);
-    
-        String accessToken = fromGoodAccessTokenRequest(continuationToken);
-    
-        given()
-            .header("Authorization", accessToken)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200)
-            .body("api", isA(String.class));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getShouldReturn400WhenMultipleCredentials() {
-        String jwtToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VyQGRvbWFpbi50bGQifQ.U-dUPv6OU6KO5N7CooHUfMkCd" +
-            "FJHx2F3H4fm7Q79g1BPfBSkifPj5xyVlZ0JwEGXypC4zBw9ay3l4DxzX7D_6p1Hx_ihXsoLx1Ca-WUo44x-XRSpPfgxiZjHCJkGBLMV3RZlA" +
-            "jip-d18mxkcX3JGplX_sCQkFisduAOAHuKSUg9wI6VBgUQi_0B35FYv6tP_bD6eFtvaAUN9QyXXh8UQjEp8CO12lRz6enfLx_V6BG_fEMkee" +
-            "6vRqdEqx_F9OF3eWTe1giMp_JhQ7_l1OXXtbd4TndVvTeuVy4irPbsRc-M8x_-qTDpFp6saRRsyOcFspxPp5n3yIhEK7B3UZiseXw";
-
-        String continuationToken = fromGoodContinuationTokenRequest();
-        String accessToken = fromGoodAccessTokenRequest(continuationToken);
-
-        given()
-            .header("Authorization", "Bearer " + jwtToken)
-            .header("Authorization", accessToken)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(400);
-    }
-
-    @Test
-    public void deleteMustReturnUnauthenticatedWithoutAuthorizationHeader() {
-        given()
-        .when()
-            .delete("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void deleteMustReturnUnauthenticatedWithoutAValidAuthroizationHeader() {
-        given()
-            .header("Authorization", UUID.randomUUID())
-        .when()
-            .delete("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void deleteMustReturnOKNoContentOnValidAuthorizationToken() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        String token = fromGoodAccessTokenRequest(continuationToken);
-        given()
-            .header("Authorization", token)
-        .when()
-            .delete("/authentication")
-        .then()
-            .statusCode(204);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void deleteMustInvalidAuthorizationOnCorrectAuthorization() {
-        String continuationToken = fromGoodContinuationTokenRequest();
-        zonedDateTimeProvider.setFixedDateTime(newDate);
-    
-        String accessToken = fromGoodAccessTokenRequest(continuationToken);
-        
-        goodDeleteAccessTokenRequest(accessToken);
-    
-        given()
-            .header("Authorization", accessToken)
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    private String fromGoodContinuationTokenRequest() {
-        return with()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"username\": \"" + userCredentials.getUsername() + "\", \"clientName\": \"Mozilla Thunderbird\", \"clientVersion\": \"42.0\", \"deviceName\": \"Joe Blogg’s iPhone\"}")
-        .post("/authentication")
-            .body()
-            .path("continuationToken")
-            .toString();
-    }
-
-    private String fromGoodAccessTokenRequest(String continuationToken) {
-        return with()
-            .contentType(ContentType.JSON)
-            .accept(ContentType.JSON)
-            .body("{\"token\": \"" + continuationToken + "\", \"method\": \"password\", \"password\": \"" + userCredentials.getPassword() + "\"}")
-        .post("/authentication")
-            .path("accessToken")
-            .toString();
-    }
-
-    private void goodDeleteAccessTokenRequest(String accessToken) {
-        with()
-            .header("Authorization", accessToken)
-            .delete("/authentication");
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
deleted file mode 100644
index c4075186719..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.jmap;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.util.Port;
-
-public class JmapURIBuilder {
-
-    public static URIBuilder baseUri(GuiceJamesServer jamesServer) {
-        return LocalHostURIBuilder.baseUri(
-            Port.of(jamesServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue()));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java
deleted file mode 100644
index ae5fe6db231..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.List;
-
-import jakarta.mail.Flags;
-
-import org.apache.james.core.Username;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.probe.MailboxProbe;
-
-import com.google.common.collect.ImmutableList;
-
-public class MessageAppender {
-
-    private MessageAppender() {
-
-    }
-
-    public static List<ComposedMessageId> fillMailbox(MailboxProbe mailboxProbe, String user, String mailbox) {
-        ImmutableList.Builder<ComposedMessageId> insertedMessages = ImmutableList.builder();
-        try {
-            for (int i = 0; i < 1000; ++i) {
-                String mailContent = "Subject: test\r\n\r\ntestmail" + String.valueOf(i);
-                ByteArrayInputStream messagePayload = new ByteArrayInputStream(mailContent.getBytes(StandardCharsets.UTF_8));
-                insertedMessages.add(
-                    mailboxProbe.appendMessage(user, MailboxPath.forUser(Username.of(user), mailbox), messagePayload, new Date(), false, new Flags()));
-            }
-        } catch (MailboxException ignored) {
-            //we expect an exception to be thrown because of quota reached
-        }
-        return insertedMessages.build();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MockSmtpTestRule.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MockSmtpTestRule.java
deleted file mode 100644
index c8e9d8c0715..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/MockSmtpTestRule.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import java.util.UUID;
-
-import org.apache.james.mock.smtp.server.ConfigurationClient;
-import org.apache.james.util.Host;
-import org.apache.james.util.docker.DockerContainer;
-import org.apache.james.util.docker.Images;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.wait.strategy.Wait;
-
-public class MockSmtpTestRule implements TestRule {
-    public static class DockerMockSmtp {
-        private static final Logger LOGGER = LoggerFactory.getLogger(DockerMockSmtp.class);
-
-        private final DockerContainer mockSmtpServer;
-
-        DockerMockSmtp() {
-            mockSmtpServer = DockerContainer.fromName(Images.MOCK_SMTP_SERVER)
-                .withLogConsumer(outputFrame -> LOGGER.debug("MockSMTP: " + outputFrame.getUtf8String()))
-                .withExposedPorts(25, 8000)
-                .waitingFor(Wait.forLogMessage(".*Mock SMTP server started.*", 1))
-                .withName("james-testing-mock-smtp-server-" + UUID.randomUUID());
-        }
-
-        public ConfigurationClient getConfigurationClient() {
-            return ConfigurationClient.from(Host.from(
-                mockSmtpServer.getHostIp(),
-                mockSmtpServer.getMappedPort(8000)));
-        }
-
-        public String getIPAddress() {
-            return mockSmtpServer.getContainerIp();
-        }
-    }
-
-    private final DockerMockSmtp dockerMockSmtp;
-
-    public MockSmtpTestRule() {
-        this.dockerMockSmtp = new DockerMockSmtp();
-    }
-
-    @Override
-    public Statement apply(Statement statement, Description description) {
-        return dockerMockSmtp.mockSmtpServer.apply(statement, description);
-    }
-
-    public DockerMockSmtp getDockerMockSmtp() {
-        return dockerMockSmtp;
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java
deleted file mode 100644
index fe15d3f10c6..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import static io.restassured.RestAssured.given;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.hamcrest.Matchers.both;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isA;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Test;
-
-import io.restassured.RestAssured;
-
-public abstract class ModularizeJmapDraftAuthenticationStrategyTest {
-    public static String DOMAIN = "domain.tld";
-    public static Username BOB = Username.of("bob" + "@" + DOMAIN);
-    public static String BOB_PASSWORD = "123456";
-    public static Optional<List<String>> ALLOW_AUTHENTICATION_STRATEGY = Optional.of(List.of(AllowAuthenticationStrategy.class.getCanonicalName()));
-    public static Optional<List<String>> DENY_AUTHENTICATION_STRATEGY = Optional.of(List.of(DenyAuthenticationStrategy.class.getCanonicalName()));
-    public static Optional<List<String>> DEFAULT_STRATEGIES = Optional.empty();
-
-    private GuiceJamesServer jmapServer;
-    private AccessToken bobAccessToken;
-
-    protected abstract GuiceJamesServer createJmapServer(Optional<List<String>> authOverride) throws Exception;
-
-    public void setupJamesServerWithCustomAuthenticationStrategy(Optional<List<String>> authOverride) throws Throwable {
-        jmapServer = createJmapServer(authOverride);
-        jmapServer.start();
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-            .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-            .build();
-
-        jmapServer.getProbe(DataProbeImpl.class)
-            .fluent()
-            .addDomain(DOMAIN)
-            .addUser(BOB.asString(), BOB_PASSWORD);
-        bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void getAuthenticationRouteWithAllowAuthenticationStrategyShouldSucceed() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(ALLOW_AUTHENTICATION_STRATEGY);
-
-        given()
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200)
-            .body("api", equalTo("/jmap"))
-            .body("eventSource", both(isA(String.class)).and(notNullValue()))
-            .body("upload", equalTo("/upload"))
-            .body("download", equalTo("/download"));
-    }
-
-    @Test
-    public void getFilterWithAllowAuthenticationStrategyShouldNotRequiredAnyAuthentication() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(ALLOW_AUTHENTICATION_STRATEGY);
-
-        String body = "[[\"getFilter\", {}, \"#0\"]]";
-
-        given()
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, CoreMatchers.equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(0));
-    }
-
-    @Test
-    public void getAuthenticationRouteWithDenyAuthenticationStrategyShouldReturnUnauthorizedCode() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DENY_AUTHENTICATION_STRATEGY);
-
-        given()
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getAuthenticationRouteWhenDefaultAuthenticationStrategiesWithNonAuthenticationShouldReturnUnauthorizedCode() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DEFAULT_STRATEGIES);
-
-        given()
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getAuthenticationRouteWhenDefaultAuthenticationStrategiesWithValidAccessTokenShouldSucceed() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DEFAULT_STRATEGIES);
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-        .when()
-            .get("/authentication")
-        .then()
-            .statusCode(200)
-            .body("api", equalTo("/jmap"))
-            .body("eventSource", both(isA(String.class)).and(notNullValue()))
-            .body("upload", equalTo("/upload"))
-            .body("download", equalTo("/download"));
-    }
-
-    @Test
-    public void getFilterWhenDenyAuthenticationStrategyWithNonAuthenticationShouldReturnUnauthorizedCode() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DENY_AUTHENTICATION_STRATEGY);
-
-        String body = "[[\"getFilter\", {}, \"#0\"]]";
-
-        given()
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getFilterWhenDenyAuthenticationStrategyWithValidAccessTokenShouldReturnUnauthorizedCode() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DENY_AUTHENTICATION_STRATEGY);
-
-        String body = "[[\"getFilter\", {}, \"#0\"]]";
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getFilterWhenDefaultAuthenticationStrategiesWithValidAccessTokenShouldSucceed() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DEFAULT_STRATEGIES);
-
-        String body = "[[\"getFilter\", {}, \"#0\"]]";
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, CoreMatchers.equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(0));
-    }
-
-    @Test
-    public void getFilterWhenDefaultAuthenticationStrategiesWithNonAuthenticationShouldFail() throws Throwable {
-        setupJamesServerWithCustomAuthenticationStrategy(DEFAULT_STRATEGIES);
-
-        String body = "[[\"getFilter\", {}, \"#0\"]]";
-
-        given()
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(401);
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
deleted file mode 100644
index 5fdfa39aa9d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- * http://www.apache.org/licenses/LICENSE-2.0                   *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.io.IOException;
-import java.time.Duration;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.util.concurrency.ConcurrentTestRunner;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-
-public abstract class ProvisioningTest {
-    private static final String NAME = "[0][0]";
-    private static final String ARGUMENTS = "[0][1]";
-    private static final String DOMAIN = "mydomain.tld";
-    private static final Username USER = Username.of("myuser@" + DOMAIN);
-    private static final String PASSWORD = "secret";
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private GuiceJamesServer jmapServer;
-    private AccessToken userToken;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-            .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-            .build();
-
-        jmapServer.getProbe(DataProbeImpl.class)
-            .fluent()
-            .addDomain(DOMAIN)
-            .addUser(USER.asString(), PASSWORD);
-        userToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void provisionMailboxesShouldNotDuplicateMailboxByName() throws Exception {
-        ConcurrentTestRunner.builder()
-            .operation((a, b) -> with()
-                .header("Authorization", userToken.asString())
-                .body("[[\"getMailboxes\", {}, \"#0\"]]")
-                .post("/jmap"))
-            .threadCount(10)
-            .runSuccessfullyWithin(Duration.ofMinutes(1));
-
-        given()
-            .header("Authorization", userToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .header("Content-Length", notNullValue())
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(DefaultMailboxes.DEFAULT_MAILBOXES.size()))
-            .body(ARGUMENTS + ".list.name", hasItems(DefaultMailboxes.DEFAULT_MAILBOXES.toArray()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void provisionMailboxesShouldSubscribeToThem() throws Exception {
-        with()
-            .header("Authorization", userToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-            .post("/jmap");
-
-        assertThat(jmapServer.getProbe(MailboxProbeImpl.class)
-            .listSubscriptions(USER.asString()))
-            .containsAll(DefaultMailboxes.DEFAULT_MAILBOXES);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/UserCredentials.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/UserCredentials.java
deleted file mode 100644
index 25a19942e0f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/UserCredentials.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-public class UserCredentials {
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    
-    public static class Builder {
-        
-        private String username;
-        private String password;
-        
-        private Builder() {
-        }
-        
-        public Builder username(String username) {
-            this.username = username;
-            return this;
-        }
-        
-        public Builder password(String password) {
-            this.password = password;
-            return this;
-        }
-        
-        public UserCredentials build() {
-            return new UserCredentials(username, password);
-        }
-    }
-
-    private final String username;
-    private final String password;
-
-    private UserCredentials(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
deleted file mode 100644
index 396422cc133..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.SECOND_ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.SECOND_NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.api.model.AccountId;
-import org.apache.james.vacation.api.VacationPatch;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-
-public abstract class VacationIntegrationTest {
-
-    private static final Username USER_1 = Username.of("benwa@" + DOMAIN);
-    private static final Username USER_2 = Username.of("matthieu@" + DOMAIN);
-    private static final String PASSWORD = "secret";
-    private static final String REASON = "Message explaining my wonderful vacations";
-    private static final String HTML_REASON = "<b>" + REASON + "</b>";
-    public static final String ORIGINAL_MESSAGE_TEXT_BODY = "Hello someone, and thank you for joining example.com!";
-
-    private GuiceJamesServer guiceJamesServer;
-    private JmapGuiceProbe jmapGuiceProbe;
-    private AccessToken user1AccessToken;
-    private AccessToken user2AccessToken;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    @Before
-    public void setUp() throws Exception {
-        guiceJamesServer = createJmapServer();
-        guiceJamesServer.start();
-
-        DataProbe dataProbe = guiceJamesServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(USER_1.asString(), PASSWORD);
-        dataProbe.addUser(USER_2.asString(), PASSWORD);
-        MailboxProbe mailboxProbe = guiceJamesServer.getProbe(MailboxProbeImpl.class);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_2.asString(), DefaultMailboxes.OUTBOX);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_1.asString(), DefaultMailboxes.SENT);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_2.asString(), DefaultMailboxes.SENT);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_1.asString(), DefaultMailboxes.INBOX);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_2.asString(), DefaultMailboxes.INBOX);
-
-        jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class);
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-            .setPort(jmapGuiceProbe.getJmapPort().getValue())
-            .build();
-
-        user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
-        user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        guiceJamesServer.stop();
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void jmapVacationShouldGenerateAReplyWhenActive() throws Exception {
-        /* Test scenario :
-            - User 1 benw@mydomain.tld sets a Vacation on its account
-            - User 2 matthieu@mydomain.tld sends User 1 a mail
-            - User 1 should well receive this mail
-            - User 2 should well receive a notification about user 1 vacation
-        */
-
-        // User 1 benw@mydomain.tld sets a Vacation on its account
-        setVacationResponse(user1AccessToken);
-
-        // When
-        // User 2 matthieu@mydomain.tld sends User 1 a mail
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-
-        // Then
-        // User 1 should well receive this mail
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2.asString(), USER_1.asString()));
-        // User 2 should well receive a notification about user 1 vacation
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken), REASON, USER_1.asString(), USER_2.asString()));
-    }
-
-    @Test
-    public void jmapVacationShouldGenerateAReplyEvenWhenNoText() throws Exception {
-        jmapGuiceProbe.modifyVacation(
-            AccountId.fromUsername(USER_1),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .build());
-
-        // When
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-
-        // Then
-        // User 1 should well receive this mail
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2.asString(), USER_1.asString()));
-        // User 2 should well receive a notification about user 1 vacation
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken), "", USER_1.asString(), USER_2.asString()));
-    }
-
-    @Test
-    public void jmapVacationShouldHaveSupportForHtmlMail() throws Exception {
-        setHtmlVacationResponse(user1AccessToken);
-
-        // When
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-
-        // Then
-        calmlyAwait.atMost(10, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2.asString(), USER_1.asString()));
-        calmlyAwait.atMost(10, TimeUnit.SECONDS)
-                .until(() -> assertOneMessageWithHtmlBodyReceived(user2AccessToken, getInboxId(user2AccessToken), HTML_REASON, USER_1.asString(), USER_2.asString()));
-    }
-
-    @Test
-    public void jmapVacationShouldNotGenerateAReplyWhenInactive() throws Exception {
-        /* Test scenario :
-            - User 2 matthieu@mydomain.tld sends User 1 a mail
-            - User 1 should well receive this mail
-            - User 2 should not receive a notification
-        */
-
-        // When
-        // User 2 matthieu@mydomain.tld sends User 1 a mail
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-
-        // Then
-        // User 1 should well receive this mail
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2.asString(), USER_1.asString()));
-        // User 2 should not receive a notification
-        Thread.sleep(1000L);
-        with()
-            .header("Authorization", user2AccessToken.asString())
-            .body("[[\"getMessageList\", " +
-                "{" +
-                "  \"fetchMessages\": true, " +
-                "  \"filter\": {" +
-                "    \"inMailboxes\":[\"" + getInboxId(user2AccessToken) + "\"]" +
-                "  }" +
-                "}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", empty());
-    }
-
-    @Test
-    public void jmapVacationShouldNotSendNotificationTwice() throws Exception {
-        /* Test scenario :
-            - User 1 benw@mydomain.tld sets a Vacation on its account
-            - User 2 matthieu@mydomain.tld sends User 1 a mail
-            - User 2 matthieu@mydomain.tld sends User 1 a second mail
-            - User 1 should well receive this mail
-            - User 2 should well receive only one notification about user 1 vacation
-        */
-
-        // User 1 benw@mydomain.tld sets a Vacation on its account
-        setVacationResponse(user1AccessToken);
-
-        // When
-        // User 2 matthieu@mydomain.tld sends User 1 a mail
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|2");
-
-        // Then
-        // User 2 should well receive a notification about user 1 vacation
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken), REASON, USER_1.asString(), USER_2.asString()));
-        // User 2 should not receive another notification
-        Thread.sleep(1000L);
-        assertOneMessageReceived(user2AccessToken, getInboxId(user2AccessToken), REASON, USER_1.asString(), USER_2.asString());
-    }
-
-    @Test
-    public void jmapVacationShouldSendNotificationTwiceWhenVacationReset() throws Exception {
-        /* Test scenario :
-            - User 1 benw@mydomain.tld sets a Vacation on its account
-            - User 2 matthieu@mydomain.tld sends User 1 a mail
-            - User 2 matthieu@mydomain.tld sends User 1 a second mail
-            - User 1 should well receive this mail
-            - User 2 should well receive only one notification about user 1 vacation
-        */
-
-        // User 1 benw@mydomain.tld sets a Vacation on its account
-        setVacationResponse(user1AccessToken);
-        // User 2 matthieu@mydomain.tld sends User 1 a mail
-        String user2OutboxId = getOutboxId(user2AccessToken);
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|1");
-        // Wait user 1 to receive the eMail before reset of vacation
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2.asString(), USER_1.asString()));
-
-        // When
-        // User 1 benw@mydomain.tld resets a Vacation on its account
-        setVacationResponse(user1AccessToken);
-        // User 2 matthieu@mydomain.tld sends User 1 a mail
-        sendMail(user2AccessToken, user2OutboxId, "user|inbox|2");
-
-        // Then
-        // User 2 should well receive two notification about user 1 vacation
-        calmlyAwait.atMost(30, TimeUnit.SECONDS)
-            .until(() -> areTwoTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken)));
-    }
-
-    private void setVacationResponse(AccessToken user1AccessToken) {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-            "  \"update\":{" +
-            "    \"singleton\" : {" +
-            "      \"id\": \"singleton\"," +
-            "      \"isEnabled\": \"true\"," +
-            "      \"textBody\": \"" + REASON + "\"" +
-            "    }" +
-            "  }" +
-            "}, \"#0\"" +
-            "]]";
-        given()
-            .header("Authorization", user1AccessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-    }
-
-    private void setHtmlVacationResponse(AccessToken user1AccessToken) {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-            "  \"update\":{" +
-            "    \"singleton\" : {" +
-            "      \"id\": \"singleton\"," +
-            "      \"isEnabled\": \"true\"," +
-            "      \"htmlBody\": \"" + HTML_REASON + "\"" +
-            "    }" +
-            "  }" +
-            "}, \"#0\"" +
-            "]]";
-        given()
-            .header("Authorization", user1AccessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-    }
-
-    private void sendMail(AccessToken user2AccessToken, String outboxId, String mailId) {
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + mailId + "\" : {" +
-            "        \"from\": { \"email\": \"" + USER_2.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Benwa\", \"email\": \"" + USER_1.asString() + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"" + ORIGINAL_MESSAGE_TEXT_BODY + "\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-        given()
-            .header("Authorization", user2AccessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-    }
-
-    private boolean areTwoTextMessageReceived(AccessToken recipientToken, String mailboxId) {
-        try {
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", " +
-                    "{" +
-                    "  \"fetchMessages\": true, " +
-                    "  \"filter\": {" +
-                    "    \"inMailboxes\":[\"" + mailboxId + "\"]" +
-                    "  }" +
-                    "}, \"#0\"]]")
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(SECOND_NAME, equalTo("messages"))
-                .body(SECOND_ARGUMENTS + ".list", hasSize(2));
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    private boolean isTextMessageReceived(AccessToken recipientToken, String mailboxId, String expectedTextBody, String expectedFrom, String expectedTo) {
-        try {
-            assertOneMessageReceived(recipientToken, mailboxId, expectedTextBody, expectedFrom, expectedTo);
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    private void assertOneMessageReceived(AccessToken recipientToken, String mailboxId, String expectedTextBody, String expectedFrom, String expectedTo) {
-        with()
-            .header("Authorization", recipientToken.asString())
-            .body("[[\"getMessageList\", " +
-                "{" +
-                "  \"fetchMessages\": true, " +
-                "  \"fetchMessageProperties\": [\"textBody\", \"from\", \"to\", \"mailboxIds\"]," +
-                "  \"filter\": {" +
-                "    \"inMailboxes\":[\"" + mailboxId + "\"]" +
-                "  }" +
-                "}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].textBody", equalTo(expectedTextBody))
-            .body(SECOND_ARGUMENTS + ".list[0].from.email", equalTo(expectedFrom))
-            .body(SECOND_ARGUMENTS + ".list[0].to.email", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].to.email[0]", equalTo(expectedTo));
-    }
-
-    private boolean assertOneMessageWithHtmlBodyReceived(AccessToken recipientToken, String mailboxId, String expectedHtmlBody, String expectedFrom, String expectedTo) {
-        try {
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", " +
-                    "{" +
-                    "  \"fetchMessages\": true, " +
-                    "  \"fetchMessageProperties\": [\"htmlBody\", \"from\", \"to\", \"mailboxIds\"]," +
-                    "  \"filter\": {" +
-                    "    \"inMailboxes\":[\"" + mailboxId + "\"]" +
-                    "  }" +
-                    "}, \"#0\"]]")
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(SECOND_NAME, equalTo("messages"))
-                .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-                .body(SECOND_ARGUMENTS + ".list[0].htmlBody", equalTo(expectedHtmlBody))
-                .body(SECOND_ARGUMENTS + ".list[0].from.email", equalTo(expectedFrom))
-                .body(SECOND_ARGUMENTS + ".list[0].to.email", hasSize(1))
-                .body(SECOND_ARGUMENTS + ".list[0].to.email[0]", equalTo(expectedTo));
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    private String getOutboxId(AccessToken accessToken) {
-        return getMailboxIdByRole(accessToken, DefaultMailboxes.OUTBOX);
-    }
-
-    private String getInboxId(AccessToken accessToken) {
-        return getMailboxIdByRole(accessToken, DefaultMailboxes.INBOX);
-    }
-
-    private String getMailboxIdByRole(AccessToken accessToken, String role) {
-        return getAllMailboxesIds(accessToken).stream()
-            .filter(x -> x.get("role").equalsIgnoreCase(role))
-            .map(x -> x.get("id"))
-            .findFirst()
-            .get();
-    }
-
-    private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
-        return with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
-            .post("/jmap")
-        .andReturn()
-            .body()
-            .jsonPath()
-            .getList(ARGUMENTS + ".list");
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
deleted file mode 100644
index 7eaa7b088ed..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap;
-
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.LOCALHOST_IP;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.net.smtp.SMTPClient;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.MailAddress;
-import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.apache.james.jmap.api.model.AccountId;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.mock.smtp.server.model.Mail;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.protocols.SmtpGuiceProbe;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.vacation.api.VacationPatch;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.github.fge.lambdas.Throwing;
-
-public abstract class VacationRelayIntegrationTest {
-
-    private static final String USER = "benwa";
-    private static final String USER_WITH_DOMAIN = USER + '@' + DOMAIN;
-    private static final String PASSWORD = "secret";
-    private static final String REASON = "Message explaining my wonderful vacations";
-
-    @ClassRule
-    public static MockSmtpTestRule fakeSmtp = new MockSmtpTestRule();
-
-    private GuiceJamesServer guiceJamesServer;
-    private JmapGuiceProbe jmapGuiceProbe;
-
-    protected abstract GuiceJamesServer getJmapServer() throws IOException;
-
-    protected abstract InMemoryDNSService getInMemoryDns();
-
-    @Before
-    public void setUp() throws Exception {
-        getInMemoryDns()
-            .registerMxRecord("yopmail.com", fakeSmtp.getDockerMockSmtp().getIPAddress());
-
-        guiceJamesServer = getJmapServer();
-        guiceJamesServer.start();
-
-        DataProbe dataProbe = guiceJamesServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(USER_WITH_DOMAIN, PASSWORD);
-        MailboxProbe mailboxProbe = guiceJamesServer.getProbe(MailboxProbeImpl.class);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_WITH_DOMAIN, DefaultMailboxes.SENT);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USER_WITH_DOMAIN, DefaultMailboxes.INBOX);
-
-        jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class);
-    }
-
-    @After
-    public void teardown() {
-        fakeSmtp.getDockerMockSmtp().getConfigurationClient().clearMails();
-        fakeSmtp.getDockerMockSmtp().getConfigurationClient().clearBehaviors();
-        guiceJamesServer.stop();
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void forwardingAnEmailShouldWork() throws Exception {
-        jmapGuiceProbe.modifyVacation(AccountId.fromString(USER_WITH_DOMAIN), VacationPatch
-            .builder()
-            .isEnabled(true)
-            .textBody(REASON)
-            .build());
-
-        String externalMail = "ray@yopmail.com";
-
-        SMTPClient smtpClient = new SMTPClient();
-        smtpClient.connect(LOCALHOST_IP, guiceJamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort().getValue());
-        smtpClient.helo(DOMAIN);
-        smtpClient.setSender(externalMail);
-        smtpClient.rcpt("<" + USER_WITH_DOMAIN + ">");
-        smtpClient.sendShortMessageData("Reply-To: <" + externalMail + ">\r\n\r\ncontent");
-
-        calmlyAwait.atMost(1, TimeUnit.MINUTES)
-            .untilAsserted(() -> {
-                List<Mail> mails = fakeSmtp.getDockerMockSmtp().getConfigurationClient()
-                    .listMails();
-
-                assertThat(mails).hasSize(1);
-                SoftAssertions.assertSoftly(Throwing.consumer(softly -> {
-                    softly.assertThat(mails.get(0).getEnvelope().getFrom()).isEqualTo(MailAddress.nullSender());
-                    softly.assertThat(mails.get(0).getEnvelope().getRecipients())
-                        .containsOnly(Mail.Recipient.builder()
-                            .address(new MailAddress(externalMail))
-                            .build());
-                    softly.assertThat(mails.get(0).getMessage()).contains(REASON);
-                }));
-            });
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/BasicFeature.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/BasicFeature.java
deleted file mode 100644
index c8e9b6f6f8b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/BasicFeature.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.categories;
-
-/**
- * Category marker for Junit 4 conditional execution
- * Marks tests that should be run on every product
- */
-public interface BasicFeature {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
deleted file mode 100644
index 1c494299d14..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.james.jmap.categories;
-
-/**
- * Category marker for Junit 4 conditional execution
- * Marks tests that should be run only on Cassandra & OpenSearch implementation
- */
-public interface CassandraAndOpenSearchCategory {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/EnableCucumber.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/EnableCucumber.java
deleted file mode 100644
index 9621ef0ad70..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/EnableCucumber.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.categories;
-
-/**
- * Category marker for Junit 4 conditional execution
- * Enables cucumber test by default as cucumber tags are being used for conditional execution
- */
-public interface EnableCucumber {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java
deleted file mode 100644
index 150ca92233b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import io.restassured.RestAssured;
-
-public abstract class CorsHeaderAPITest {
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken accessToken;
-    private GuiceJamesServer jmapServer;
-    
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-    
-    @Test
-    public void apiShouldPositionCorsHeaders() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"accountId\": \"1\"}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .header("Access-Control-Allow-Origin", "*")
-            .header("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT")
-            .header("Access-Control-Allow-Headers", "Content-Type, Authorization, Accept")
-            .header("Access-Control-Max-Age", "86400");
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
deleted file mode 100644
index 4078ad19780..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
+++ /dev/null
@@ -1,2449 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.CEDRIC;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Durations.ONE_MINUTE;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasSize;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.JmapCommonRequests;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-
-public abstract class FilterTest {
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    protected abstract MailboxId randomMailboxId();
-
-    private AccessToken accessToken;
-    private AccessToken bobAccessToken;
-    private GuiceJamesServer jmapServer;
-
-    private MailboxId matchedMailbox;
-    private MailboxId inbox;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-            .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-            .build();
-
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        dataProbe.addUser(BOB.asString(), BOB_PASSWORD);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-        bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
-
-        MailboxProbeImpl mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        matchedMailbox = mailboxProbe.createMailbox(MailboxPath.forUser(ALICE, "matched"));
-        inbox = mailboxProbe.createMailbox(MailboxPath.inbox(ALICE));
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void getFilterShouldReturnEmptyByDefault() {
-        String body = "[[" +
-                "  \"getFilter\", " +
-                "  {}, " +
-                "\"#0\"" +
-                "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(0));
-    }
-
-    @Test
-    public void getFilterShouldReturnEmptyWhenExplicitNullAccountId() {
-        String body = "[[" +
-                "  \"getFilter\", " +
-                "  {\"accountId\": null}, " +
-                "\"#0\"" +
-                "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(0));
-    }
-
-    @Test
-    public void getFilterShouldReturnErrorWhenUnsupportedAccountId() {
-        String body = "[[" +
-                "  \"getFilter\", " +
-                "  {\"accountId\": \"any\"}, " +
-                "\"#0\"" +
-                "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(body)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'GetFilterRequest' is not supported"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setFilterShouldOverwritePreviouslyStoredRules() {
-        MailboxId mailbox1 = randomMailboxId();
-        MailboxId mailbox2 = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My first rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox2.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"42-ac\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"from\"," +
-                  "        \"comparator\": \"exactly-equals\"," +
-                  "        \"value\": \"marvin@h2.g2\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "            \"mailboxIds\": [\"" + mailbox1.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"getFilter\", " +
-                  "  {}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(1))
-            .body(ARGUMENTS + ".singleton[0].id", equalTo("42-ac"))
-            .body(ARGUMENTS + ".singleton[0].name", equalTo("My last rule"))
-            .body(ARGUMENTS + ".singleton[0].condition.field", equalTo("from"))
-            .body(ARGUMENTS + ".singleton[0].condition.comparator", equalTo("exactly-equals"))
-            .body(ARGUMENTS + ".singleton[0].condition.value", equalTo("marvin@h2.g2"))
-            .body(ARGUMENTS + ".singleton[0].action.appendIn.mailboxIds", containsInAnyOrder(mailbox1.serialize()));
-    }
-
-    @Test
-    public void setFilterShouldRejectRuleWithInvalidRuleName() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-34e\"," +
-                "      \"name\": null," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"question\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("`name` is mandatory"));
-    }
-
-    @Test
-    public void setFilterShouldRejectRuleWithInvalidRuleId() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": null," +
-                "      \"name\": \"some name\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"question\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("`id` is mandatory"));
-    }
-
-    @Test
-    public void setFilterShouldRejectRuleWithoutRuleCondition() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-34e\"," +
-                "      \"name\": \"some name\"," +
-                "      \"condition\": null," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("`condition` is mandatory"));
-    }
-
-    @Test
-    public void setFilterShouldRejectRuleWithInvalidRuleCondition() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-34e\"," +
-                "      \"name\": \"some name\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\" " +
-                "       }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("'null' is not a valid comparator name"));
-    }
-
-    @Test
-    public void setFilterShouldReturnUpdatedSingleton() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("filterSet"))
-            .body(ARGUMENTS + ".updated", containsInAnyOrder("singleton"));
-    }
-
-    @Test
-    public void setFilterShouldRejectDuplicatedRules() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("filterSet"))
-            .body(ARGUMENTS + ".updated", hasSize(0))
-            .body(ARGUMENTS + ".notUpdated.singleton.type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".notUpdated.singleton.description", equalTo("The following rules were duplicated: ['3000-34e']"));
-    }
-
-    @Test
-    public void setFilterShouldRejectRulesTargetingSeveralMailboxes() {
-        MailboxId mailbox1 = randomMailboxId();
-        MailboxId mailbox2 = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox1.serialize() + "\",\"" + mailbox2.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("filterSet"))
-            .body(ARGUMENTS + ".updated", hasSize(0))
-            .body(ARGUMENTS + ".notUpdated.singleton.type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".notUpdated.singleton.description", equalTo("The following rules targeted several mailboxes, which is not supported: ['3000-34e']"));
-    }
-
-    @Test
-    public void setFilterShouldRejectAccountId() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"accountId\": \"any\"," +
-                  "    \"singleton\": []" +
-                  "  }, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'SetFilterRequest' is not supported"));
-    }
-
-    @Test
-    public void setFilterShouldAcceptNullAccountId() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"accountId\": null," +
-                  "    \"singleton\": []" +
-                  "  }, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("filterSet"))
-            .body(ARGUMENTS + ".updated", hasSize(1));
-    }
-
-    @Test
-    public void setFilterShouldRejectIfInState() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"ifInState\": \"any\"," +
-                  "    \"singleton\": []" +
-                  "  }, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'ifInState' of 'SetFilterRequest' is not supported"));
-    }
-
-    @Test
-    public void setFilterShouldAcceptNullIfInState() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"ifInState\": null," +
-                  "    \"singleton\": []" +
-                  "  }, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .body(NAME, equalTo("filterSet"))
-            .body(ARGUMENTS + ".updated", hasSize(1));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getFilterShouldRetrievePreviouslyStoredRules() {
-        MailboxId mailbox1 = randomMailboxId();
-        MailboxId mailbox2 = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"42-ac\"," +
-                  "      \"name\": \"My first rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"from\"," +
-                  "        \"comparator\": \"exactly-equals\"," +
-                  "        \"value\": \"marvin@h2.g2\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "            \"mailboxIds\": [\"" + mailbox1.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox2.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"getFilter\", " +
-                  "  {}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(2))
-            .body(ARGUMENTS + ".singleton[0].id", equalTo("42-ac"))
-            .body(ARGUMENTS + ".singleton[0].name", equalTo("My first rule"))
-            .body(ARGUMENTS + ".singleton[0].condition.field", equalTo("from"))
-            .body(ARGUMENTS + ".singleton[0].condition.comparator", equalTo("exactly-equals"))
-            .body(ARGUMENTS + ".singleton[0].condition.value", equalTo("marvin@h2.g2"))
-            .body(ARGUMENTS + ".singleton[0].action.appendIn.mailboxIds", containsInAnyOrder(mailbox1.serialize()))
-            .body(ARGUMENTS + ".singleton[1].id", equalTo("3000-34e"))
-            .body(ARGUMENTS + ".singleton[1].name", equalTo("My last rule"))
-            .body(ARGUMENTS + ".singleton[1].condition.field", equalTo("subject"))
-            .body(ARGUMENTS + ".singleton[1].condition.comparator", equalTo("contains"))
-            .body(ARGUMENTS + ".singleton[1].condition.value", equalTo("question"))
-            .body(ARGUMENTS + ".singleton[1].action.appendIn.mailboxIds", containsInAnyOrder(mailbox2.serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setFilterShouldClearPreviouslyStoredRulesWhenEmptyBody() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-34e\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": []" +
-                  "  }, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"getFilter\", " +
-                  "  {}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(0));
-    }
-
-    @Test
-    public void allFieldsAndComparatorsShouldBeSupported() {
-        MailboxId mailbox = randomMailboxId();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"setFilter\", " +
-                  "  {" +
-                  "    \"singleton\": [" +
-                  "    {" +
-                  "      \"id\": \"3000-341\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"subject\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-342\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"cc\"," +
-                  "        \"comparator\": \"not-contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-343\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"to\"," +
-                  "        \"comparator\": \"exactly-equals\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-344\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"recipient\"," +
-                  "        \"comparator\": \"not-exactly-equals\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    {" +
-                  "      \"id\": \"3000-345\"," +
-                  "      \"name\": \"My last rule\"," +
-                  "      \"condition\": {" +
-                  "        \"field\": \"from\"," +
-                  "        \"comparator\": \"contains\"," +
-                  "        \"value\": \"question\"" +
-                  "      }," +
-                  "      \"action\": {" +
-                  "        \"appendIn\": {" +
-                  "          \"mailboxIds\": [\"" + mailbox.serialize() + "\"]" +
-                  "        }" +
-                  "      }" +
-                  "    }" +
-                  "  ]}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                  "  \"getFilter\", " +
-                  "  {}, " +
-                  "\"#0\"" +
-                  "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("filter"))
-            .body(ARGUMENTS + ".singleton", hasSize(5))
-            .body(ARGUMENTS + ".singleton[0].id", equalTo("3000-341"))
-            .body(ARGUMENTS + ".singleton[0].condition.field", equalTo("subject"))
-            .body(ARGUMENTS + ".singleton[0].condition.comparator", equalTo("contains"))
-            .body(ARGUMENTS + ".singleton[1].id", equalTo("3000-342"))
-            .body(ARGUMENTS + ".singleton[1].condition.field", equalTo("cc"))
-            .body(ARGUMENTS + ".singleton[1].condition.comparator", equalTo("not-contains"))
-            .body(ARGUMENTS + ".singleton[2].id", equalTo("3000-343"))
-            .body(ARGUMENTS + ".singleton[2].condition.field", equalTo("to"))
-            .body(ARGUMENTS + ".singleton[2].condition.comparator", equalTo("exactly-equals"))
-            .body(ARGUMENTS + ".singleton[3].id", equalTo("3000-344"))
-            .body(ARGUMENTS + ".singleton[3].condition.field", equalTo("recipient"))
-            .body(ARGUMENTS + ".singleton[3].condition.comparator", equalTo("not-exactly-equals"))
-            .body(ARGUMENTS + ".singleton[4].id", equalTo("3000-345"))
-            .body(ARGUMENTS + ".singleton[4].condition.field", equalTo("from"))
-            .body(ARGUMENTS + ".singleton[4].condition.comparator", equalTo("contains"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenFromRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.atMost(ONE_MINUTE)
-            .until(() -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenToRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"to\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenCcRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails cc-ed to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"cc\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenRecipientRuleMatchesCc() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails cc-ed to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"recipient\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenRecipientRuleMatchesTo() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails cc-ed to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"recipient\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenSubjectRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"matchme\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"matchme\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void messageShouldBeAppendedInInboxWhenFromDoesNotMatchRule() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.atMost(ONE_MINUTE)
-            .until(() -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenToDoesNotMatchRule() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"to\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenCcDoesNotMatchRule() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails cc-ed to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"cc\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenRecipientDoesNotMatchRule() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails cc-ed to cedric\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"recipient\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenSubjectRuleDoesNotMatchRule() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"matchme\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"nomatch\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenSubjectRuleDoesNotMatchRuleBecauseOfCase() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"subject\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"different case value\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
-            "      \"subject\": \"DIFFERENT CASE VALUE\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenContainsComparatorMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"bo\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenContainsComparatorDoesNotMatch() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"ced\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenExactlyEqualsMatchesName() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"Bob\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenExactlyEqualsMatchesAddress() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"" + BOB.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenExactlyEqualsMatchesFullHeader() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"Bob <" + BOB.asString() + ">\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenExactlyEqualsMatchesCaseInsensitivelyFullHeader() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"bob <" + BOB.asString().toUpperCase(Locale.ENGLISH) + ">\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenExactlyEqualsComparatorDoesNotMatch() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"exactly-equals\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"nomatch\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenNotContainsComparatorMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"not-contains\"," +
-                "        \"value\": \"other\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenNotContainsComparatorDoesNotMatch() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"not-contains\"," +
-                "        \"value\": \"bob\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenContainsNotExactlyEqualsMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"not-exactly-equals\"," +
-                "        \"value\": \"nomatch\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenNotExactlyEqualsMatchesAddress() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"not-exactly-equals\"," +
-                "        \"value\": \"" + BOB.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenNotExactlyEqualsMatchesFullHeader() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"not-exactly-equals\"," +
-                "        \"value\": \"Bob <" + BOB.asString() + ">\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInInboxWhenNotExactlyEqualsComparatorMatchesName() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"not-exactly-equals\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"Bob\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenFirstRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    {" +
-                "      \"id\": \"3000-346\"," +
-                "      \"name\": \"Emails to alice\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"to\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + ALICE.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void messageShouldBeAppendedInSpecificMailboxWhenSecondRuleMatches() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"unknown@james.org\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    {" +
-                "      \"id\": \"3000-346\"," +
-                "      \"name\": \"Emails to alice\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"to\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + ALICE.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-    }
-
-    @Test
-    public void inboxShouldBeEmptyWhenFromRuleMatchesInSpecificMailbox() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB.asString() + "\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox));
-        assertThat(JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox)).isFalse();
-    }
-
-    @Test
-    public void matchedMailboxShouldBeEmptyWhenFromRuleDoesntMatch() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "  \"setFilter\", " +
-                "  {" +
-                "    \"singleton\": [" +
-                "    {" +
-                "      \"id\": \"3000-345\"," +
-                "      \"name\": \"Emails from bob\"," +
-                "      \"condition\": {" +
-                "        \"field\": \"from\"," +
-                "        \"comparator\": \"contains\"," +
-                "        \"value\": \"unknown@james.org\"" +
-                "      }," +
-                "      \"action\": {" +
-                "        \"appendIn\": {" +
-                "          \"mailboxIds\": [\"" + matchedMailbox.serialize() + "\"]" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  ]}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[[" +
-            "  \"setMessages\"," +
-            "  {" +
-            "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
-            "      \"subject\": \"subject\"," +
-            "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "    }}" +
-            "  }," +
-            "  \"#0\"" +
-            "]]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox));
-        assertThat(JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox)).isFalse();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
deleted file mode 100644
index 03c0cd41816..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
+++ /dev/null
@@ -1,916 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.CEDRIC;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.FIRST_MAILBOX;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.SECOND_MAILBOX;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.quota.QuotaCountLimit;
-import org.apache.james.core.quota.QuotaSizeLimit;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.jmap.draft.model.mailbox.MailboxNamespace;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.MessageManager.AppendCommand;
-import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights;
-import org.apache.james.mailbox.model.MailboxACL.Right;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.probe.ACLProbe;
-import org.apache.james.mailbox.probe.QuotaProbe;
-import org.apache.james.mime4j.dom.Message;
-import org.apache.james.modules.ACLProbeImpl;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.QuotaProbesImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.AllMatching;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import io.restassured.RestAssured;
-
-public abstract class GetMailboxesMethodTest {
-    public static final String READ = String.valueOf(Right.Read.asCharacter());
-    public static final String LOOKUP = String.valueOf(Right.Lookup.asCharacter());
-    public static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter());
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken accessToken;
-    private GuiceJamesServer jmapServer;
-    private MailboxProbeImpl mailboxProbe;
-    private ACLProbe aclProbe;
-    private QuotaProbe quotaProbe;
-
-    private Message message;
-    
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
-        quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        dataProbe.addUser(BOB.asString(), BOB_PASSWORD);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-
-        message = Message.Builder.of()
-            .setSubject("test")
-            .setBody("testmail", StandardCharsets.UTF_8)
-            .build();
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-    
-    @Test
-    public void getMailboxesShouldErrorNotSupportedWhenRequestContainsNonNullAccountId() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"accountId\": \"1\"}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'GetMailboxesRequest' is not supported"));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnEmptyWhenIdsDoesntMatch() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name");
-        String removedId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "quicklyRemoved").serialize();
-        mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "quicklyRemoved");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + removedId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(0));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnErrorWhenInvalidMailboxId() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"invalid id\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnMailboxesWhenIdsMatch() {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-        String mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "myMailbox").serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\", \"" + mailboxId2 + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(2))
-            .body(ARGUMENTS + ".list[0].id", equalTo(mailboxId))
-            .body(ARGUMENTS + ".list[1].id", equalTo(mailboxId2));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnOnlyMatchingMailboxesWhenIdsGiven() {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "myMailbox");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".id", equalTo(mailboxId));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnEmptyWhenIdsIsEmpty() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": []}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", empty());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnAllMailboxesWhenIdsIsNull() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "myMailbox");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "myMailbox2");
-
-        List<String> expectedMailboxes = ImmutableList.<String>builder()
-                .addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
-                .add("myMailbox")
-                .add("myMailbox2")
-                .build();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": null}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(expectedMailboxes.size()))
-            .body(ARGUMENTS + ".list.name", hasItems(expectedMailboxes.toArray()));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnSharedWithProperty() throws Exception {
-        String mailboxName = "myMailbox";
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), mailboxName).serialize();
-        String targetUser1 = "touser1@" + DOMAIN;
-        String targetUser2 = "touser2@" + DOMAIN;
-
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Administer));
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser2, new Rfc4314Rights(Right.Read, Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(mailboxName))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(targetUser1, ImmutableList.of(ADMINISTER, LOOKUP)))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(targetUser2, ImmutableList.of(LOOKUP, READ)));
-    }
-
-    @Test
-    public void getMailboxesShouldRemoveOwnerRight() throws Exception {
-        String mailboxName = "myMailbox";
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), mailboxName).serialize();
-        String targetUser1 = "touser1@" + DOMAIN;
-
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), ALICE.asString(), new Rfc4314Rights(Right.Read, Right.Administer));
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Read, Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(mailboxName))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(targetUser1, ImmutableList.of(LOOKUP, READ)));
-    }
-
-    @Test
-    public void getMailboxShouldReturnEmptySharedWithWhenNoDelegation() {
-        String mailboxName = "myMailbox";
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), mailboxName).serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(mailboxName))
-            .body(FIRST_MAILBOX + ".sharedWith", is(ImmutableMap.of()));
-    }
-
-    @Test
-    public void nonHandledRightsShouldBeFilteredOut() throws Exception {
-        String mailboxName = "myMailbox";
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), mailboxName).serialize();
-        String targetUser1 = "touser1@" + DOMAIN;
-
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Post));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(mailboxName))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(targetUser1, ImmutableList.of(LOOKUP)));
-    }
-    
-    @Test
-    public void getMailboxesShouldErrorInvalidArgumentsWhenRequestIsInvalid() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": true}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("Cannot deserialize value of type `java.util.ArrayList<org.apache.james.mailbox.model.MailboxId>` from Boolean value (token `JsonToken.VALUE_TRUE`)"))
-            .body(ARGUMENTS + ".description", containsString("(through reference chain: org.apache.james.jmap.draft.model.GetMailboxesRequest$Builder[\"ids\"])"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnDefaultMailboxesWhenAuthenticatedUserDoesntHaveAnAccountYet() {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzM3QGRvbWFpbi50bGQiLCJuYW1lIjoiTmV3IFVzZXIif" +
-            "Q.bPeoAWAOyu4teilj27cL4uZ9jBO9zJOus3mJdqZYEeDe9OZeweopqkIE7ljuh-iTxBDE-f3OqaEqGa_mi6eOYT7XXAEPolcEAe4EooU" +
-            "lI8anYMrSlbMPBKGymH-QTWIcPS5P8XNFnIn94XheuEIXeaRHNvO5-SgENbFYS19kgyzOV54umQtIAewLyMdvG6aooLSk6lEy3AhVPIfl" +
-            "QJm6MLOsNzHMj7F7mM0Wm6QBfYeWIHzQLtEgGFFLyqeSXyzbgbbec2WYpVjXHNyWhAFcq7OMjOb2UEmb9gKr1fkL_XZgXna2CW46hzwaG" +
-            "jNO-6ZWpHjLfDEP7oHui51Hn_wJfw";
-
-        given()
-            .header("Authorization", "Bearer " + token)
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(DefaultMailboxes.DEFAULT_MAILBOXES.size()))
-            .body(ARGUMENTS + ".list.name", hasItems(DefaultMailboxes.DEFAULT_MAILBOXES.toArray()));
-    }
-
-    @Test
-    public void getMailboxesShouldErrorWithBadJWTToken() {
-
-        String badAuthToken = "BADTOKENOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIn0.T04BTk" +
-                "LXkJj24coSZkK13RfG25lpvmSl2MJ7N10KpBk9_-95EGYZdog-BDAn3PJzqVw52z-Bwjh4VOj1-j7cURu0cT4jXehhUrlCxS4n7QHZ" +
-                "DN_bsEYGu7KzjWTpTsUiHe-rN7izXVFxDGG1TGwlmBCBnPW-EFCf9ylUsJi0r2BKNdaaPRfMIrHptH1zJBkkUziWpBN1RNLjmvlAUf" +
-                "49t1Tbv21ZqYM5Ht2vrhJWczFbuC-TD-8zJkXhjTmA1GVgomIX5dx1cH-dZX1wANNmshUJGHgepWlPU-5VIYxPEhb219RMLJIELMY2" +
-                "qNOR8Q31ydinyqzXvCSzVJOf6T60-w";
-
-        given()
-            .header("Authorization", "Bearer " + badAuthToken)
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(401);
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMailboxesWhenAvailable() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name");
-
-        mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, "name"), AppendCommand.from(message));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasItem("name"));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMailboxPropertiesWhenAvailable() throws Exception {
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name").serialize();
-
-        mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, "name"), AppendCommand.from(message));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasItem("name"))
-            .body(FIRST_MAILBOX + ".parentId", nullValue())
-            .body(FIRST_MAILBOX + ".role", nullValue())
-            .body(FIRST_MAILBOX + ".sortOrder", equalTo(1000))
-            .body(FIRST_MAILBOX + ".mustBeOnlyMailbox", equalTo(false))
-            .body(FIRST_MAILBOX + ".mayReadItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayAddItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayRemoveItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayCreateChild", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayRename", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayDelete", equalTo(true))
-            .body(FIRST_MAILBOX + ".totalMessages", equalTo(1))
-            .body(FIRST_MAILBOX + ".unreadMessages", equalTo(1))
-            .body(FIRST_MAILBOX + ".unreadThreads", equalTo(0));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnFilteredMailboxesPropertiesWhenRequestContainsFilterProperties() {
-        String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name").serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + myMailboxId + "\"], \"properties\" : [\"unreadMessages\", \"sortOrder\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".id", not(is(nullValue())))
-            .body(FIRST_MAILBOX + ".name", nullValue())
-            .body(FIRST_MAILBOX + ".parentId", nullValue())
-            .body(FIRST_MAILBOX + ".role", nullValue())
-            .body(FIRST_MAILBOX + ".sortOrder", equalTo(1000))
-            .body(FIRST_MAILBOX + ".mustBeOnlyMailbox", nullValue())
-            .body(FIRST_MAILBOX + ".mayReadItems", nullValue())
-            .body(FIRST_MAILBOX + ".mayAddItems", nullValue())
-            .body(FIRST_MAILBOX + ".mayRemoveItems", nullValue())
-            .body(FIRST_MAILBOX + ".mayCreateChild", nullValue())
-            .body(FIRST_MAILBOX + ".mayRename", nullValue())
-            .body(FIRST_MAILBOX + ".mayDelete", nullValue())
-            .body(FIRST_MAILBOX + ".totalMessages", nullValue())
-            .body(FIRST_MAILBOX + ".unreadMessages", equalTo(0))
-            .body(FIRST_MAILBOX + ".unreadThreads", nullValue());
-    }
-
-    @Test
-    public void getMailboxesShouldReturnIdWhenRequestContainsEmptyPropertyListFilter() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"properties\" : []}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".id", not(is(nullValue())))
-            .body(FIRST_MAILBOX + ".name", nullValue());
-    }
-
-    @Test
-    public void getMailboxesShouldIgnoreUnknownPropertiesWhenRequestContainsUnknownPropertyListFilter() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "name");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"properties\" : [\"unknown\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".id", not(is(nullValue())))
-            .body(FIRST_MAILBOX + ".name", nullValue());
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMailboxesWithSortOrder() {
-        MailboxId inboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-        MailboxId trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.TRASH);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + inboxId.serialize() + "\", \"" + trashId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(2))
-            .body(ARGUMENTS + ".list[0].name", equalTo(DefaultMailboxes.INBOX))
-            .body(ARGUMENTS + ".list[0].sortOrder", equalTo(10))
-            .body(ARGUMENTS + ".list[1].name", equalTo(DefaultMailboxes.TRASH))
-            .body(ARGUMENTS + ".list[1].sortOrder", equalTo(60));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMailboxesWithRolesInLowerCase() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.OUTBOX);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".role", equalTo(DefaultMailboxes.OUTBOX.toLowerCase(Locale.US)));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnMailboxesWithFilteredSharedWithWhenShared() throws Exception {
-        String mailboxName = "name";
-        MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), mailboxName);
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-        aclProbe.replaceRights(bobMailboxPath, CEDRIC.asString(), new Rfc4314Rights(Right.Lookup));
-
-        Map<String, String> sharedWith = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + bobMailbox.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasSize(1))
-        .extract()
-            .jsonPath()
-            .get(FIRST_MAILBOX + ".sharedWith");
-
-        assertThat(sharedWith).containsOnlyKeys(ALICE.asString());
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMailboxesWithFullSharedWithWhenHasAdminRight() throws Exception {
-        String mailboxName = "name";
-        MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), mailboxName);
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup, Right.Administer));
-        aclProbe.replaceRights(bobMailboxPath, CEDRIC.asString(), new Rfc4314Rights(Right.Lookup));
-
-        Map<String, String> sharedWith = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + bobMailbox.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasSize(1))
-        .extract()
-            .jsonPath()
-            .get(FIRST_MAILBOX + ".sharedWith");
-
-        assertThat(sharedWith).containsOnlyKeys(ALICE.asString(), CEDRIC.asString());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnAllAccessibleMailboxesWhenEmptyIds() throws Exception {
-        String sharedMailboxName = "BobShared";
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), DefaultMailboxes.INBOX);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedMailboxName);
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-
-        List<String> expectedMailboxes = ImmutableList.<String>builder()
-            .addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
-            .add(sharedMailboxName)
-            .build();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(expectedMailboxes.size()))
-            .body(ARGUMENTS + ".list.name", hasItems(expectedMailboxes.toArray()));
-    }
-
-    @Test
-    public void getMailboxesShouldFilterMailboxesWithLookupRightWhenEmptyIds() throws Exception {
-        String sharedReadMailboxName = "BobShared";
-        String sharedAdministerMailboxName = "BobShared1";
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), DefaultMailboxes.INBOX);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedReadMailboxName);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedAdministerMailboxName);
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-        MailboxPath bobSharedReadMailboxPath = MailboxPath.forUser(BOB, sharedReadMailboxName);
-        MailboxPath bobSharedAdministerMailboxPath = MailboxPath.forUser(BOB, sharedAdministerMailboxName);
-
-        aclProbe.replaceRights(bobSharedReadMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-        aclProbe.replaceRights(bobSharedAdministerMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Administer));
-
-        List<String> expectedMailboxes = ImmutableList.<String>builder()
-            .addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
-            .add(sharedReadMailboxName)
-            .build();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(expectedMailboxes.size()))
-            .body(ARGUMENTS + ".list.name", hasItems(expectedMailboxes.toArray()));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnExactUserInbox() throws Exception {
-        String mailboxName = "BobShared";
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), mailboxName);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), DefaultMailboxes.INBOX);
-        MailboxId aliceInboxMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + aliceInboxMailbox.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasItems(MailboxConstants.INBOX))
-            .body(ARGUMENTS + ".list.id", hasItems(aliceInboxMailbox.serialize()));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnSharedMailboxesWithRead() throws Exception {
-        String sharedMailboxName = "BobShared";
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), DefaultMailboxes.INBOX);
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedMailboxName);
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list.id", hasItems(mailboxId.serialize()));
-    }
-
-    @Test
-    public void getMailboxesShouldNotExposeRoleOfSharedMailboxToSharee() throws Exception {
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, DefaultMailboxes.INBOX);
-        MailboxId mailboxId = mailboxProbe.createMailbox(bobMailboxPath);
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(FIRST_MAILBOX + ".role", nullValue())
-            .body(FIRST_MAILBOX + ".sortOrder", equalTo(1000));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnDelegatedNamespaceWhenSharedMailbox() throws Exception {
-        String sharedMailboxName = "BobShared";
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedMailboxName);
-
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".namespace.type", equalTo(MailboxNamespace.Type.Delegated.toString()))
-            .body(FIRST_MAILBOX + ".namespace.owner", equalTo(BOB.asString()));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnPersonalNamespaceWhenOwnerMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".namespace.type", equalTo(MailboxNamespace.Type.Personal.toString()))
-            .body(FIRST_MAILBOX + ".namespace.owner", is(nullValue()));
-    }
-
-
-    @Test
-    public void getMailboxesShouldReturnAllowedForAllMayPropertiesWhenOwner() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".mayReadItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayAddItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayRemoveItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayCreateChild", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayDelete", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayRename", equalTo(true));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnPartiallyAllowedMayPropertiesWhenDelegated() throws Exception {
-        String sharedMailboxName = "BobShared";
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedMailboxName);
-
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup, Right.Read));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".mayReadItems", equalTo(true))
-            .body(FIRST_MAILBOX + ".mayAddItems", equalTo(false))
-            .body(FIRST_MAILBOX + ".mayRemoveItems", equalTo(false))
-            .body(FIRST_MAILBOX + ".mayCreateChild", equalTo(false))
-            .body(FIRST_MAILBOX + ".mayDelete", equalTo(false))
-            .body(FIRST_MAILBOX + ".mayRename", equalTo(false));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnUnlimitedQuotasForInboxByDefault() {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['STORAGE'].max", nullValue())
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['MESSAGE'].max", nullValue());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnMaxStorageQuotasForInboxWhenSet() throws Exception {
-        quotaProbe.setGlobalMaxStorage(QuotaSizeLimit.size(42));
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['STORAGE'].max", equalTo(42));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnMaxMessageQuotasForInboxWhenSet() throws Exception {
-        quotaProbe.setGlobalMaxMessageCount(QuotaCountLimit.count(43));
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['MESSAGE'].max", equalTo(43));
-    }
-
-    @Test
-    public void getMailboxesShouldDisplayDifferentMaxQuotaPerMailboxWhenSet() throws Exception {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-        String sharedMailboxName = "BobShared";
-        MailboxId sharedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), sharedMailboxName);
-
-        MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
-        aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup, Right.Read));
-
-        quotaProbe.setMaxMessageCount(quotaProbe.getQuotaRoot(MailboxPath.inbox(ALICE)), QuotaCountLimit.count(42));
-        quotaProbe.setMaxMessageCount(quotaProbe.getQuotaRoot(MailboxPath.inbox(BOB)), QuotaCountLimit.count(43));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\",\"" + sharedMailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(2))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['MESSAGE'].max", equalTo(42))
-            .body(SECOND_MAILBOX + ".quotas['#private&bob@domain.tld']['MESSAGE'].max", equalTo(43));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnQuotaRootForAllMailboxes() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list*.quotas", AllMatching.matcher(hasKey("#private&alice@domain.tld")));
-    }
-
-    @Test
-    public void getMailboxesShouldReturnEmptyQuotasForInboxWhenNoMail() {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['STORAGE'].used", equalTo(0))
-            .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['MESSAGE'].used", equalTo(0));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMailboxesShouldReturnUpdatedQuotasForInboxWhenMailReceived() throws Exception {
-        String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize();
-
-        mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, DefaultMailboxes.INBOX), AppendCommand.from(message));
-
-        calmlyAwait.untilAsserted(() ->
-            given()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId + "\"]}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("mailboxes"))
-                .body(ARGUMENTS + ".list", hasSize(1))
-                .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['STORAGE'].used", equalTo(85))
-                .body(FIRST_MAILBOX + ".quotas['#private&alice@domain.tld']['MESSAGE'].used", equalTo(1)));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
deleted file mode 100644
index 2e4c7ccfeb0..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
+++ /dev/null
@@ -1,2454 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapCommonRequests.bodyOfMessage;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.apache.james.transport.mailets.remote.delivery.HeloNameProvider.LOCALHOST;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Durations.TEN_SECONDS;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.not;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import jakarta.mail.Flags;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.jmap.model.Number;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.FlagsBuilder;
-import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights;
-import org.apache.james.mailbox.model.MailboxACL.Right;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mime4j.dom.Message;
-import org.apache.james.mime4j.dom.Multipart;
-import org.apache.james.mime4j.message.BodyPartBuilder;
-import org.apache.james.mime4j.message.DefaultMessageWriter;
-import org.apache.james.mime4j.message.MultipartBuilder;
-import org.apache.james.mime4j.message.SingleBodyBuilder;
-import org.apache.james.modules.ACLProbeImpl;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.protocols.ImapGuiceProbe;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.util.ClassLoaderUtils;
-import org.apache.james.util.date.ImapDateTimeFormatter;
-import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.TestIMAPClient;
-import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.github.fge.lambdas.Throwing;
-
-import io.restassured.RestAssured;
-
-public abstract class GetMessageListMethodTest {
-    private static final String FORWARDED = "$Forwarded";
-    private static final ZoneId ZONE_ID = ZoneId.of("Europe/Paris");
-    public static final MailboxPath ALICE_MAILBOX = MailboxPath.forUser(ALICE, "mailbox");
-    public static final MailboxPath ALICE_OTHER_MAILBOX = MailboxPath.forUser(ALICE, "othermailbox");
-    private ACLProbeImpl aclProbe;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    protected abstract void await();
-
-    protected AccessToken aliceAccessToken;
-    private AccessToken bobAccessToken;
-    private GuiceJamesServer jmapServer;
-    protected MailboxProbeImpl mailboxProbe;
-    private DataProbe dataProbe;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        this.aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-        dataProbe.addUser(BOB.asString(), BOB_PASSWORD);
-        this.bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void getMessageListShouldNotListMessageIfTheUserHasOnlyLookupRight() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), "delegated");
-        MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
-        mailboxProbe.appendMessage(BOB.asString(), delegatedMailboxPath,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        await();
-
-        aclProbe.replaceRights(delegatedMailboxPath,
-            ALICE.asString(),
-            new Rfc4314Rights(Right.Lookup));
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessagesListShouldListMessageWhenTheUserHasOnlyReadRight() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), "delegated");
-        MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
-        ComposedMessageId message = mailboxProbe.appendMessage(BOB.asString(), delegatedMailboxPath,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        await();
-
-        aclProbe.replaceRights(delegatedMailboxPath,
-            ALICE.asString(),
-            new Rfc4314Rights(Right.Read));
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldNotFilterMessagesWhenTextFilterMatchesBodyAfterTheMessageMailboxHasBeenChanged() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        MailboxId otherMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "otherMailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
-        await();
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"setMessages\", {\"update\":{\"" + messageId + "\":{\"mailboxIds\": [\"" + otherMailboxId.serialize() + "\"]}}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"tiramisu\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(messageId));
-    }
-
-    @Test
-    public void getMessageListShouldFilterMessagesMarkedAsDeleted() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.DELETED));
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"tiramisu\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void searchByFromFieldShouldSupportUTF8FromName() throws Exception {
-        String toUsername = "username1@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(toUsername, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromName = "ÃœsteliÄŸhan MaÅŸrapa";
-        String fromAddress = ALICE.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"" + fromName + "\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(aliceAccessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = with()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        String searchedMessageId = calmlyAwait.atMost(TEN_SECONDS)
-            .until(() -> searchFirstMessageByFromField(fromName), Matchers.notNullValue());
-
-        assertThat(searchedMessageId)
-            .isEqualTo(messageId);
-    }
-
-    private String searchFirstMessageByFromField(String from) {
-        String searchRequest = "[" +
-            "  [" +
-            "    \"getMessageList\"," +
-            "    {" +
-            "      \"filter\": {" +
-            "        \"from\": \"" + from + "\"" +
-            "      }," +
-            "      \"sort\": [" +
-            "        \"date desc\"" +
-            "      ]," +
-            "      \"collapseThreads\": false," +
-            "      \"fetchMessages\": false," +
-            "      \"position\": 0," +
-            "      \"limit\": 1" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        return with()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(searchRequest)
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .extract()
-            .path(ARGUMENTS + ".messageIds[0]");
-    }
-
-    @Test
-    public void getMessageListShouldListMessageThatHasBeenMovedInAMailboxWhereTheUserHasOnlyReadRight() throws Exception {
-        MailboxId delegatedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), "delegated");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB.asString(), "not_delegated");
-
-        MailboxPath notDelegatedMailboxPath = MailboxPath.forUser(BOB, "not_delegated");
-        MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(BOB.asString(), notDelegatedMailboxPath,
-            new ByteArrayInputStream("Subject: chaussette\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        await();
-
-        aclProbe.replaceRights(delegatedMailboxPath,
-            ALICE.asString(),
-            new Rfc4314Rights(Right.Read));
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body("[[\"setMessages\", {\"update\":{\"" + messageId + "\":{\"mailboxIds\": [\"" + delegatedMailboxId.serialize() + "\"]}}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"subject\":\"chaussette\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldNotDuplicateMessagesInSeveralMailboxes() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        await();
-
-        jmapServer.getProbe(JmapGuiceProbe.class).setInMailboxes(message.getMessageId(), ALICE, mailboxId, mailboxId2);
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", hasSize(1));
-    }
-
-    @Test
-    public void getMessageListSetFlaggedFilterShouldResultFlaggedMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isFlagged\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListUnsetFlaggedFilterShouldReturnNotFlaggedMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isFlagged\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListReadFilterShouldReturnOnlyReadMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotRead = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageRead = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isUnread\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageRead.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotRead.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListUnreadFilterShouldReturnOnlyUnreadMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotRead = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageRead = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isUnread\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotRead.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageRead.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListSetDraftFilterShouldReturnOnlyDraftMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageDraft = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.DRAFT));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isDraft\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageDraft.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotDraft.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListUnsetDraftFilterShouldReturnOnlyNonDraftMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageDraft = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.DRAFT));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isDraft\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotDraft.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageDraft.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListSetAnsweredFilterShouldReturnOnlyAnsweredMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageAnswered = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isAnswered\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageAnswered.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotAnswered.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListUnsetAnsweredFilterShouldReturnOnlyNotAnsweredMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageAnswered = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isAnswered\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotAnswered.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageAnswered.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListSetForwardedFilterShouldReturnOnlyForwardedMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageForwarded = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(FORWARDED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isForwarded\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageForwarded.getMessageId().serialize()),
-                not(containsInAnyOrder(messageNotForwarded.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListUnsetForwardedFilterShouldReturnOnlyNotForwardedMessages() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageForwarded = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(FORWARDED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"isForwarded\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageNotForwarded.getMessageId().serialize()),
-                not(containsInAnyOrder(messageForwarded.getMessageId().serialize()))));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListANDOperatorShouldReturnMessagesWhichMatchAllConditions() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"AND\",\"conditions\":[{\"isFlagged\":\"true\"},{\"isUnread\":\"true\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotSeenFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotSeenNotFlagged.getMessageId().serialize(),
-                            messageSeenNotFlagged.getMessageId().serialize(),
-                            messageSeenFlagged.getMessageId().serialize()))));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldFetchUnreadMessagesInMailbox() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "othermailbox");
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        ComposedMessageId messageNotSeenFlaggedInOtherMailbox = mailboxProbe.appendMessage(ALICE.asString(), ALICE_OTHER_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        ComposedMessageId messageSeenInOtherMailbox = mailboxProbe.appendMessage(ALICE.asString(), ALICE_OTHER_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\": {\"inMailboxes\": [\"" + mailboxId.serialize() + "\"], \"isUnread\":\"true\"}}, \"#0\"]]")
-
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotSeenNotFlagged.getMessageId().serialize(), messageNotSeenFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageSeenNotFlagged.getMessageId().serialize(),
-                            messageSeenFlagged.getMessageId().serialize(),
-                            messageSeenInOtherMailbox.getMessageId().serialize(),
-                            messageNotSeenFlaggedInOtherMailbox.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListShouldRejectNestedInMailboxClause() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxPath.forUser(ALICE, "mailbox"));
-        mailboxProbe.createMailbox(MailboxPath.forUser(ALICE, "othermailbox"));
-        mailboxProbe.createMailbox(MailboxPath.inbox(ALICE));
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        ComposedMessageId messageNotSeenFlaggedInOtherMailbox = mailboxProbe.appendMessage(ALICE.asString(), ALICE_OTHER_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        ComposedMessageId messageSeenInOtherMailbox = mailboxProbe.appendMessage(ALICE.asString(), ALICE_OTHER_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"AND\",\"conditions\":[{\"inMailboxes\": [\"" + mailboxId.serialize() + "\"]},{\"isUnread\":\"true\"}]}}, \"#0\"]]")
-                .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type",  equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description",  equalTo("'inMailboxes' and 'notInMailboxes' wrapped within Filter Operators are not implemented. Review your search request."));
-    }
-
-    @Test
-    public void getMessageListShouldRejectTooDeepFilter() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":" +
-                    "{\"operator\":\"AND\"," +
-                    " \"conditions\":[{\"operator\":\"AND\"," +
-                    "  \"conditions\":[{\"operator\":\"AND\"," +
-                    "   \"conditions\":[{\"operator\":\"AND\"," +
-                    "    \"conditions\":[{\"operator\":\"AND\"," +
-                    "     \"conditions\":[{\"operator\":\"AND\"," +
-                    "      \"conditions\":[{\"operator\":\"AND\"," +
-                    "       \"conditions\":[{\"operator\":\"AND\"," +
-                    "        \"conditions\":[{\"operator\":\"AND\"," +
-                    "         \"conditions\":[{\"operator\":\"AND\"," +
-                    "          \"conditions\":[{\"operator\":\"AND\"," +
-                    "           \"conditions\":[{\"operator\":\"AND\"," +
-                    "            \"conditions\":[{\"operator\":\"AND\"," +
-                    "             \"conditions\":[{\"isUnread\":\"true\"}" +
-                    "]}]}]}]}]}]}]}]}]}]}]}]}]}}, \"#0\"]]")
-                .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type",  equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description",  equalTo("Filter depth is higher than maximum allowed value 10"));
-    }
-
-    @Test
-    public void getMessageListOROperatorShouldReturnMessagesWhichMatchOneOfAllConditions() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"OR\",\"conditions\":[{\"isFlagged\":\"true\"},{\"isUnread\":\"true\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageNotSeenFlagged.getMessageId().serialize(),
-                            messageSeenFlagged.getMessageId().serialize(),
-                            messageNotSeenNotFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageSeenNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListNOTOperatorShouldReturnMessagesWhichNotMatchAnyCondition() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"NOT\",\"conditions\":[{\"isFlagged\":\"true\"},{\"isUnread\":\"true\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageSeenNotFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotSeenFlagged.getMessageId().serialize(),
-                            messageSeenFlagged.getMessageId().serialize(),
-                            messageNotSeenNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListNestedOperatorsShouldReturnMessagesWhichMatchConditions() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"OR\",\"conditions\":[" +
-                "{\"operator\":\"AND\", \"conditions\":[{\"isFlagged\":\"true\"},{\"isUnread\":\"true\"}]}," +
-                "{\"operator\":\"AND\", \"conditions\":[{\"isFlagged\":\"true\"},{\"isUnread\":\"false\"}]}" +
-                "]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                    containsInAnyOrder(messageSeenFlagged.getMessageId().serialize(),
-                            messageNotSeenFlagged.getMessageId().serialize()),
-                    not(containsInAnyOrder(messageNotSeenNotFlagged.getMessageId().serialize(),
-                            messageSeenNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListShouldReturnErrorInvalidArgumentsWhenRequestIsInvalid() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\": true}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"));
-    }
-
-    @Test
-    public void getMessageListShouldReturnErrorInvalidArgumentsWhenHeaderIsInvalid() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"header\":[\"132\", \"456\", \"789\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"));
-    }
-
-    @Test
-    public void getMessageListShouldSupportHasAttachmentSetToTrue() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"hasAttachment\":\"true\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSupportHasAttachmentSetToFalse() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"hasAttachment\":\"false\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message3.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldNotFailWhenHeaderIsValid() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"header\":[\"132\", \"456\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"));
-    }
-
-    @Test
-    public void getMessageListShouldReturnAllMessagesWhenSingleMailboxNoParameters() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldReturnAllMessagesWhenMultipleMailboxesAndNoParameters() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, "mailbox2"),
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldReturnAllMessagesOfCurrentUserOnlyWhenMultipleMailboxesAndNoParameters() throws Exception {
-        String otherUser = "other@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(otherUser, password);
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, "mailbox2"),
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, otherUser, "mailbox");
-        mailboxProbe.appendMessage(otherUser, MailboxPath.forUser(Username.of(otherUser), "mailbox"),
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenInMailboxesFilterMatches() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId.serialize() + "\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldNotExcludeMessagesWhenInMailboxesFilterMatchesMailboxAndText() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        List<String> messageIds = IntStream.range(0, 3)
-            .boxed()
-            .map(Throwing.function((ignored) -> mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                    new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags())).sneakyThrow())
-            .map(ComposedMessageId::getMessageId)
-            .map(MessageId::serialize)
-            .collect(Collectors.toList());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId.serialize() + "\"],\"text\":\"test\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", equalTo(messageIds));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenMultipleInMailboxesFilterMatches() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"%s\", \"%s\"]}}, \"#0\"]]", mailboxId.serialize(), mailboxId2.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenNotInMailboxesFilterMatches() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"]}}, \"#0\"]]", mailboxId.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenNotInMailboxesFilterMatchesTwice() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        mailboxProbe.appendMessage(ALICE.asString(), MailboxPath.forUser(ALICE, "mailbox2"),
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\", \"%s\"]}}, \"#0\"]]", mailboxId.serialize(), mailbox2Id.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenIdenticalNotInMailboxesAndInMailboxesFilterMatch() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"], \"inMailboxes\":[\"%s\"]}}, \"#0\"]]", mailboxId.serialize(), mailboxId.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenNotInMailboxesFilterDoesNotMatch() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[\"%s\"]}}, \"#0\"]]", mailbox2Id.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenEmptyNotInMailboxesFilter() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox2");
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"notInMailboxes\":[]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenInMailboxesFilterDoesntMatches() throws Exception {
-        MailboxId emptyMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "emptyMailbox");
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body(String.format("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"%s\"]}}, \"#0\"]]", emptyMailboxId.serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenTextFilterDoesntMatches() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"bad\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenTextFilterMatchesBody() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"html\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    @Category(CassandraAndOpenSearchCategory.class)
-    public void getMessageListShouldIncludeMessagesWhenTextFilterMatchesBodyWithStemming() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                ClassLoader.getSystemResourceAsStream("eml/htmlMail.eml"), new Date(), false, new Flags());
-        await();
-        // text/html contains: "This is a mail with beautifull html content which contains a banana."
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"contain banana\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenSubjectFilterMatchesSubject() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"subject\":\"Image\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenFromFilterMatchesFrom() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"from\":\"from@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenFromFilterDoesntMatchFrom() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"from\":\"to@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenToFilterMatchesTo() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"to\":\"to@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenToFilterDoesntMatchTo() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"to\":\"from@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenCcFilterMatchesCc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"cc\":\"cc@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenCcFilterDoesntMatchCc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"cc\":\"bcc@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenBccFilterMatchesBcc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"bcc\":\"bcc@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldExcludeMessagesWhenBccFilterDoesntMatchBcc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"bcc\":\"to@james.org\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    @Category(CassandraAndOpenSearchCategory.class)
-    public void getMessageListShouldExcludeMessagesWhenAttachmentFilterDoesntMatch() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
-        Multipart multipart = MultipartBuilder.create("mixed")
-                .addBodyPart(BodyPartBuilder.create()
-                    .setBody(attachmentContent, "application/pdf")
-                    .setContentDisposition("attachment"))
-                .addBodyPart(BodyPartBuilder.create()
-                    .setBody("The message has a PDF attachment.", "plain", StandardCharsets.UTF_8))
-                .build();
-        Message message = Message.Builder.of()
-                .setBody(multipart)
-                .build();
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream(DefaultMessageWriter.asBytes(message)), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"attachments\":\"no apple inside\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", empty());
-    }
-
-    @Test
-    @Category(CassandraAndOpenSearchCategory.class)
-    public void getMessageListShouldIncludeMessagesWhenAttachmentFilterMatches() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
-        Multipart multipart = MultipartBuilder.create("mixed")
-                .addBodyPart(BodyPartBuilder.create()
-                    .setBody(attachmentContent, "application/pdf")
-                    .setContentDisposition("attachment"))
-                .addBodyPart(BodyPartBuilder.create()
-                    .setBody("The message has a PDF attachment.", "plain", StandardCharsets.UTF_8))
-                .build();
-        Message message = Message.Builder.of()
-                .setBody(multipart)
-                .build();
-        ComposedMessageId composedMessageId = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream(DefaultMessageWriter.asBytes(message)), new Date(), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"attachments\":\"beautiful banana\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".messageIds", contains(composedMessageId.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByDateDefault() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenDateDoesntHaveCentury() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.parse("Wed, 28 Jun 17 09:23:01 +0200", ImapDateTimeFormatter.rfc5322());
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        LocalDate date2 = LocalDate.parse("Tue, 27 Jun 2017 09:23:01 +0200", ImapDateTimeFormatter.rfc5322());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date2), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByDateAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedBySubjectAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: a subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: b subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"subject asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedBySubjectDesc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: a subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: b subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"subject desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByFromAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nFrom: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nFrom: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"from asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByFromDesc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nFrom: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nFrom: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"from desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByToAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nTo: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nTo: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"to asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByToDesc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nTo: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nTo: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"to desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedBySizeAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail bigger".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"size asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedBySizeDesc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail bigger".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"size desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedBySizeAndDateAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: test\r\n\r\ntestmail smaller".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 15:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"size asc\", \"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message3.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByDateAndSizeAsc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail smaller".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Date: Fri, 02 Jun 2017 15:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date), false, new Flags());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date desc\", \"size asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message3.getMessageId().serialize(), message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldSupportIdSorting() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"id\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByDateDesc() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortMessagesWhenSortedByDateDescAndInMailbox() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId.serialize() + "\"]}, \"sort\":[\"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldWorkWhenCollapseThreadIsFalse() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"collapseThreads\":false}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"));
-    }
-
-    @Test
-    public void getMessageListShouldWorkWhenCollapseThreadIsTrue() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"collapseThreads\":true}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"));
-    }
-
-    @Test
-    public void getMessageListShouldReturnAllMessagesWhenPositionIsNotGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldReturnSkipMessagesWhenPositionIsGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"position\":1, \"sort\":[\"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldReturnSkipMessagesWhenPositionAndLimitGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(2)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"position\":1, \"limit\":1, \"sort\":[\"date desc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldReturnAllMessagesWhenLimitIsNotGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldReturnLimitMessagesWhenLimitGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"limit\":1}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldReturnLimitMessagesWithDefaultValueWhenLimitIsNotGiven() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test4\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", containsInAnyOrder(message1.getMessageId().serialize(), message2.getMessageId().serialize(), message3.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldChainFetchingMessagesWhenAskedFor() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\":true}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body("[0][0]", equalTo("messageList"))
-            .body("[1][0]", equalTo("messages"))
-            .body("[0][1].messageIds", hasSize(1))
-            .body("[0][1].messageIds[0]", equalTo(message.getMessageId().serialize()))
-            .body("[1][1].list", hasSize(1))
-            .body("[1][1].list[0].id", equalTo(message.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getMessageListShouldComputeTextBodyWhenNoTextBodyButHtmlBody() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        String mailContent = "Content-Type: text/html\r\n"
-            + "Subject: message 1 subject\r\n"
-            + "\r\n"
-            + "Hello <b>someone</b>, and thank you for joining example.com!";
-        LocalDate date = LocalDate.now();
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream(mailContent.getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"htmlBody\", \"textBody\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body("[0][0]", equalTo("messageList"))
-            .body("[1][0]", equalTo("messages"))
-            .body("[0][1].messageIds", hasSize(1))
-            .body("[1][1].list[0].htmlBody", equalTo("Hello <b>someone</b>, and thank you for joining example.com!"))
-            .body("[1][1].list[0].textBody", equalTo("Hello someone, and thank you for joining example.com!"));
-    }
-
-    @Test
-    public void getMessageListHasKeywordFilterShouldReturnMessagesWithKeywords() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"hasKeyword\":\"$Flagged\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageFlagged.getMessageId().serialize()),
-                not(containsInAnyOrder(messageNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListHasKeywordFilterShouldReturnMessagesWithUserKeywords() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        Flags flags = FlagsBuilder.builder()
-            .add(Flags.Flag.FLAGGED)
-            .add(FORWARDED)
-            .build();
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"AND\",\"conditions\":[{\"hasKeyword\":\"$Flagged\"},{\"hasKeyword\":\"$Forwarded\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-            containsInAnyOrder(messageFlagged.getMessageId().serialize()),
-            not(containsInAnyOrder(messageNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutKeywords() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"notKeyword\":\"$Flagged\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageNotFlagged.getMessageId().serialize()),
-                not(containsInAnyOrder(messageFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutUserKeywords() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        Flags flags = FlagsBuilder.builder()
-            .add(Flags.Flag.FLAGGED)
-            .add(FORWARDED)
-            .build();
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"AND\",\"conditions\":[{\"notKeyword\":\"$Flagged\"},{\"notKeyword\":\"$Forwarded\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageNotFlagged.getMessageId().serialize()),
-                not(containsInAnyOrder(messageFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutKeywordsWhenMultipleNotKeywordAndFilterOperator() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        Flags flags = FlagsBuilder.builder()
-            .add(FORWARDED)
-            .add(Flags.Flag.DRAFT)
-            .build();
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"operator\":\"OR\",\"conditions\":[{\"notKeyword\":\"$Flagged\"},{\"notKeyword\":\"$Forwarded\"}]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds",
-                containsInAnyOrder(messageNotFlagged.getMessageId().serialize(), messageFlagged.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListHasKeywordAndNotKeywordFilterShouldReturnMessagesWithAndWithoutKeywords() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"hasKeyword\":\"$Flagged\", \"notKeyword\":\"$Draft\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", allOf(
-                containsInAnyOrder(messageFlagged.getMessageId().serialize()),
-                not(containsInAnyOrder(messageNotFlagged.getMessageId().serialize()))));
-    }
-
-    @Test
-    public void getMessageListHasKeywordShouldIgnoreRecent() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.RECENT));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"hasKeyword\":\"$Recent\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds",
-                containsInAnyOrder(messageFlagged.getMessageId().serialize(), messageNotFlagged.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListNotKeywordShouldIgnoreRecent() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
-        ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.RECENT));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"notKeyword\":\"$Recent\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds",
-                containsInAnyOrder(messageFlagged.getMessageId().serialize(), messageNotFlagged.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListShouldSortUsingInternalDateWhenNoDateHeader() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        LocalDate date = LocalDate.now();
-        ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"sort\":[\"date asc\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize(), message1.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListFileNameFilterShouldReturnOnlyMessagesWithMatchingAttachmentFileNames() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                    .setSubject("test")
-                    .setBody("content", StandardCharsets.UTF_8)));
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                    .setBody(
-                        MultipartBuilder.create("alternative")
-                            .addBodyPart(BodyPartBuilder.create()
-                                .setContentDisposition("attachment", "matchme.txt")
-                                .setBody(SingleBodyBuilder.create()
-                                    .setText("this is the file content...")
-                                    .setCharset(StandardCharsets.UTF_8)
-                                    .build())
-                                .build())
-                            .build())));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"attachmentFileName\":\"matchme.txt\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize()));
-    }
-
-    @Test
-    public void getMessageListFileNameFilterShouldNotReturnMessagesWithOnlyAttachmentContentMatching() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                    .setBody(
-                        MultipartBuilder.create("alternative")
-                            .addBodyPart(BodyPartBuilder.create()
-                                .setContentDisposition("attachment", "nomatch.md")
-                                .setBody(SingleBodyBuilder.create()
-                                    .setText("matchme.txt ...")
-                                    .setCharset(StandardCharsets.UTF_8)
-                                    .build())
-                                .build())
-                            .build())));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"attachmentFileName\":\"matchme.txt\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", hasSize(0));
-    }
-
-    @Test
-    public void getMessageListTextFilterShouldReturnOnlyMessagesWithMatchingAttachmentFileNames() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                    .setSubject("test")
-                    .setBody("content", StandardCharsets.UTF_8)));
-        ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                    .setBody(
-                        MultipartBuilder.create("alternative")
-                            .addBodyPart(BodyPartBuilder.create()
-                                .setContentDisposition("attachment", "matchme.txt")
-                                .setBody(SingleBodyBuilder.create()
-                                    .setText("this is the file content...")
-                                    .setCharset(StandardCharsets.UTF_8)
-                                    .build())
-                                .build())
-                            .build())));
-
-        await();
-
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{\"text\":\"matchme.txt\"}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", contains(message2.getMessageId().serialize()));
-    }
-
-    private Date convertToDate(LocalDate localDate) {
-        return Date.from(localDate.atStartOfDay(ZONE_ID).toInstant());
-    }
-
-    @Test
-    public void getMessageListShouldAcceptLessThan2Pow53NumberForPosition() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"position\":" + Number.MAX_VALUE + "}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messageList"));
-    }
-
-    @Test
-    public void getMessageListShouldErrorWhenPositionOver2Pow53() {
-        given()
-            .header("Authorization", aliceAccessToken.asString())
-            .body("[[\"getMessageList\", {\"position\":" + Number.MAX_VALUE + 1 + "}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("value should be positive and less than 2^53"));
-    }
-
-    @Test
-    public void getMessageListShouldReturnTwoMessagesWhenCopiedAtOnceViaIMAP() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
-        MailboxId otherMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "otherMailbox");
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-            MessageManager.AppendCommand.builder()
-            .build(Message.Builder.of()
-                    .setSubject("test 1")
-                    .setBody("content 1", StandardCharsets.UTF_8)));
-
-        mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
-                MessageManager.AppendCommand.builder()
-                .build(Message.Builder.of()
-                        .setSubject("test 2")
-                        .setBody("content 2", StandardCharsets.UTF_8)));
-
-        try (TestIMAPClient imap = new TestIMAPClient()) {
-            imap.connect(LOCALHOST, jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-            .login(ALICE, ALICE_PASSWORD)
-            .select("mailbox")
-            .copyAllMessagesInMailboxTo("otherMailbox");
-        }
-
-        await();
-
-        calmlyAwait
-            .atMost(30, TimeUnit.SECONDS)
-            .until(() -> twoMessagesFoundInMailbox(otherMailboxId));
-    }
-
-    @Test
-    public void aMessageInOutboxShouldBeAccessibleViaJmap() throws Exception {
-        MailboxId outboxMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "Outbox");
-        String messageBody = "We're all mad here.";
-        mailboxProbe.appendMessage(
-            ALICE.asString(),
-            MailboxPath.forUser(ALICE, "Outbox"),
-            new ByteArrayInputStream(("Subject: test\r\n\r\n" + messageBody).getBytes(StandardCharsets.UTF_8)),
-            new Date(), false, new Flags());
-
-        calmlyAwait
-            .atMost(30, TimeUnit.SECONDS)
-            .until(() -> listMessageIdsInMailbox(aliceAccessToken, outboxMailboxId.serialize()).size() == 1);
-
-        assertThat(bodyOfMessage(aliceAccessToken, listMessageIdsInMailbox(aliceAccessToken, outboxMailboxId.serialize()).get(0)))
-            .isEqualTo(messageBody);
-    }
-
-    private boolean twoMessagesFoundInMailbox(MailboxId mailboxId) {
-        try {
-            with()
-                .header("Authorization", aliceAccessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId.serialize() + "\"]}}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messageList"))
-                .body(ARGUMENTS + ".messageIds", hasSize(2));
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
deleted file mode 100644
index 5b790dec879..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.core.IsNull.nullValue;
-
-import java.io.IOException;
-import java.time.ZonedDateTime;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
-import org.apache.james.jmap.api.model.AccountId;
-import org.apache.james.vacation.api.VacationPatch;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-
-public abstract class GetVacationResponseTest {
-    public static final String SUBJECT = "subject";
-    public static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
-    public static final ZonedDateTime DATE_2014 = ZonedDateTime.parse("2014-09-30T14:10:00+02:00");
-    public static final ZonedDateTime DATE_2016 = ZonedDateTime.parse("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]");
-    private JmapGuiceProbe jmapGuiceProbe;
-
-    protected abstract GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException;
-
-    private AccessToken accessToken;
-    private GuiceJamesServer jmapServer;
-    private FixedDateZonedDateTimeProvider fixedDateZonedDateTimeProvider;
-
-    @Before
-    public void setup() throws Throwable {
-        fixedDateZonedDateTimeProvider = new FixedDateZonedDateTimeProvider();
-        fixedDateZonedDateTimeProvider.setFixedDateTime(DATE_2015);
-
-        jmapServer = createJmapServer(fixedDateZonedDateTimeProvider);
-        jmapServer.start();
-
-        jmapGuiceProbe = jmapServer.getProbe(JmapGuiceProbe.class);
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapGuiceProbe.getJmapPort().getValue())
-                .build();
-
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getVacationResponseShouldReturnDefaultValue() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "\"getVacationResponse\", " +
-                "{}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
-            .body(ARGUMENTS + ".list[0].fromDate", nullValue())
-            .body(ARGUMENTS + ".list[0].toDate", nullValue())
-            .body(ARGUMENTS + ".list[0].isEnabled", equalTo(false))
-            .body(ARGUMENTS + ".list[0].subject", nullValue())
-            .body(ARGUMENTS + ".list[0].textBody", nullValue())
-            .body(ARGUMENTS + ".list[0].htmlBody", nullValue());
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void getVacationResponseShouldReturnStoredValue() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromUsername(ALICE),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .fromDate(ZonedDateTime.parse("2014-09-30T14:10:00Z"))
-                .toDate(ZonedDateTime.parse("2014-10-30T14:10:00Z"))
-                .textBody("Test explaining my vacations")
-                .subject(SUBJECT)
-                .htmlBody("<p>Test explaining my vacations</p>")
-                .build());
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "\"getVacationResponse\", " +
-                "{}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
-            .body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00Z"))
-            .body(ARGUMENTS + ".list[0].toDate", equalTo("2014-10-30T14:10:00Z"))
-            .body(ARGUMENTS + ".list[0].isEnabled", equalTo(true))
-            .body(ARGUMENTS + ".list[0].textBody", equalTo("Test explaining my vacations"))
-            .body(ARGUMENTS + ".list[0].subject", equalTo(SUBJECT))
-            .body(ARGUMENTS + ".list[0].htmlBody", equalTo("<p>Test explaining my vacations</p>"));
-    }
-
-    @Test
-    public void getVacationResponseShouldReturnStoredValueWithNonDefaultTimezone() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromUsername(ALICE),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .fromDate(ZonedDateTime.parse("2014-09-30T14:10:00+02:00"))
-                .toDate(ZonedDateTime.parse("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]"))
-                .textBody("Test explaining my vacations")
-                .build());
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "\"getVacationResponse\", " +
-                "{}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
-            .body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00+02:00"))
-            .body(ARGUMENTS + ".list[0].toDate", equalTo("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]"))
-            .body(ARGUMENTS + ".list[0].isEnabled", equalTo(true))
-            .body(ARGUMENTS + ".list[0].textBody", equalTo("Test explaining my vacations"));
-    }
-
-    @Test
-    public void getVacationResponseShouldReturnIsActivatedWhenInRange() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromUsername(ALICE),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .fromDate(DATE_2014)
-                .toDate(DATE_2016)
-                .textBody("Test explaining my vacations")
-                .build());
-
-        given()
-            .accept(ContentType.JSON)
-            .contentType(ContentType.JSON)
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                    "\"getVacationResponse\", " +
-                    "{}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".list[0].isActivated", equalTo(true));
-    }
-
-    @Test
-    public void getVacationResponseShouldNotReturnIsActivatedWhenOutOfRange() {
-        fixedDateZonedDateTimeProvider.setFixedDateTime(DATE_2014);
-
-        jmapGuiceProbe.modifyVacation(AccountId.fromUsername(ALICE),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .fromDate(DATE_2015)
-                .toDate(DATE_2016)
-                .textBody("Test explaining my vacations")
-                .build());
-
-        given()
-            .accept(ContentType.JSON)
-            .contentType(ContentType.JSON)
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                    "\"getVacationResponse\", " +
-                    "{}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".list[0].isActivated", equalTo(false));
-    }
-
-    @Test
-    public void accountIdIsNotSupported() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromUsername(ALICE),
-            VacationPatch.builder()
-                .isEnabled(true)
-                .fromDate(ZonedDateTime.parse("2014-09-30T14:10:00+02:00"))
-                .toDate(ZonedDateTime.parse("2014-10-30T14:10:00+02:00"))
-                .textBody("Test explaining my vacations")
-                .build());
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[" +
-                "\"getVacationResponse\", " +
-                "{\"accountId\":\"1\"}, " +
-                "\"#0\"" +
-                "]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'GetVacationRequest' is not supported"));
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
deleted file mode 100644
index e052db70e2f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapCommonRequests.concatMessageIds;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.awaitility.Durations.TWO_MINUTES;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasItem;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.core.quota.QuotaSizeLimit;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.QuotaProbesImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.awaitility.core.ConditionFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.google.common.base.Strings;
-
-import io.restassured.RestAssured;
-import io.restassured.parsing.Parser;
-
-public abstract class QuotaMailingTest {
-    private static final Username HOMER = Username.of("homer@" + DOMAIN);
-    private static final Username BART = Username.of("bart@" + DOMAIN);
-    private static final String PASSWORD = "password";
-    private static final String BOB_PASSWORD = "bobPassword";
-    private static final ConditionFactory WAIT_TWO_MINUTES = calmlyAwait.atMost(TWO_MINUTES);
-    private QuotaProbesImpl quotaProbe;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken homerAccessToken;
-    private AccessToken bartAccessToken;
-    private GuiceJamesServer jmapServer;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        MailboxProbe mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-            .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-            .build();
-        RestAssured.defaultParser = Parser.JSON;
-
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(HOMER.asString(), PASSWORD);
-        dataProbe.addUser(BART.asString(), BOB_PASSWORD);
-        mailboxProbe.createMailbox("#private", HOMER.asString(), DefaultMailboxes.INBOX);
-        homerAccessToken = authenticateJamesUser(baseUri(jmapServer), HOMER, PASSWORD);
-        bartAccessToken = authenticateJamesUser(baseUri(jmapServer), BART, BOB_PASSWORD);
-    }
-
-    @After
-    public void tearDown() {
-        jmapServer.stop();
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void shouldSendANoticeWhenThresholdExceeded() throws Exception {
-        quotaProbe.setMaxStorage(quotaProbe.getQuotaRoot(MailboxPath.inbox(HOMER)), QuotaSizeLimit.size(100 * 1000));
-
-        bartSendMessageToHomer();
-        // Homer receives a mail big enough to trigger a configured threshold
-
-        WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 2);
-
-        List<String> ids = listMessageIdsForAccount(homerAccessToken);
-        String idString = concatMessageIds(ids);
-
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [" + idString + "]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(ARGUMENTS + ".list.subject",
-                hasItem("Warning: Your email usage just exceeded a configured threshold"));
-    }
-
-    @Test
-    public void configurationShouldBeWellLoaded() throws Exception {
-        quotaProbe.setMaxStorage(quotaProbe.getQuotaRoot(MailboxPath.inbox(HOMER)), QuotaSizeLimit.size(100 * 1000));
-
-        bartSendMessageToHomer();
-        // Homer receives a mail big enough to trigger a 10% configured threshold
-        WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 2);
-
-        bartSendMessageToHomer();
-        // Homer receives a mail big enough to trigger a 20% configured threshold
-        WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 4);
-
-        List<String> ids = listMessageIdsForAccount(homerAccessToken);
-        String idString = concatMessageIds(ids);
-
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [" + idString + "]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(ARGUMENTS + ".list.textBody",
-                hasItem(containsString("You currently occupy more than 10 % of the total size allocated to you")))
-            .body(ARGUMENTS + ".list.textBody",
-                hasItem(containsString("You currently occupy more than 20 % of the total size allocated to you")));
-    }
-
-    private void bartSendMessageToHomer() {
-        String messageCreationId = "creationId";
-        String outboxId = getOutboxId(bartAccessToken);
-        String bigEnoughBody = Strings.repeat("123456789\n", 12 * 100);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART.asString() + "\"}," +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
-            "        \"subject\": \"Message without an attachment\"," +
-            "        \"textBody\": \"" + bigEnoughBody + "\"," +
-            "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"] " +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", bartAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
deleted file mode 100644
index c3067834a7c..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapCommonRequests.getInboxId;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
-import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.awaitility.Durations.TWO_MINUTES;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-import java.util.List;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.core.quota.QuotaSizeLimit;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.MessageAppender;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.model.QuotaRoot;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.mailbox.probe.QuotaProbe;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.QuotaProbesImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.google.common.collect.Iterables;
-
-import io.restassured.RestAssured;
-import io.restassured.parsing.Parser;
-
-public abstract class SendMDNMethodTest {
-    private static final Username HOMER = Username.of("homer@" + DOMAIN);
-    private static final Username BART = Username.of("bart@" + DOMAIN);
-    private static final String PASSWORD = "password";
-    private static final String BOB_PASSWORD = "bobPassword";
-
-    protected abstract MessageId randomMessageId();
-
-    private AccessToken homerAccessToken;
-    private AccessToken bartAccessToken;
-    private GuiceJamesServer jmapServer;
-
-    @BeforeEach
-    void setup(GuiceJamesServer jmapServer) throws Throwable {
-        this.jmapServer = jmapServer;
-        MailboxProbe mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.defaultParser = Parser.JSON;
-
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(HOMER.asString(), PASSWORD);
-        dataProbe.addUser(BART.asString(), BOB_PASSWORD);
-        mailboxProbe.createMailbox("#private", HOMER.asString(), DefaultMailboxes.INBOX);
-        mailboxProbe.createMailbox("#private", HOMER.asString(), DefaultMailboxes.OUTBOX);
-        homerAccessToken = authenticateJamesUser(baseUri(jmapServer), HOMER, PASSWORD);
-        bartAccessToken = authenticateJamesUser(baseUri(jmapServer), BART, BOB_PASSWORD);
-    }
-
-    private String bartSendMessageToHomer() {
-        String messageCreationId = "creationId";
-        String outboxId = getOutboxId(bartAccessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART.asString() + "\"}," +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body, plain text version\"," +
-            "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"] " +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String id = with()
-            .header("Authorization", bartAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.until(() -> !listMessageIdsForAccount(homerAccessToken).isEmpty());
-        return id;
-    }
-
-    private void sendAWrongInitialMessage() {
-        String messageCreationId = "creationId";
-        String outboxId = getOutboxId(bartAccessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body, plain text version\"," +
-            "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"] " +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", bartAccessToken.asString())
-            .body(requestBody)
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.until(() -> !listMessageIdsForAccount(homerAccessToken).isEmpty());
-    }
-
-    @Test
-    void sendMDNShouldReturnCreatedMessageId() {
-        bartSendMessageToHomer();
-
-        List<String> messageIds = listMessageIdsForAccount(homerAccessToken);
-
-        String creationId = "creation-1";
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                    "    \"messageId\":\"" + messageIds.get(0) + "\"," +
-                    "    \"subject\":\"subject\"," +
-                    "    \"textBody\":\"textBody\"," +
-                    "    \"reportingUA\":\"reportingUA\"," +
-                    "    \"disposition\":{" +
-                    "        \"actionMode\":\"automatic-action\"," +
-                    "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                    "        \"type\":\"processed\"" +
-                    "    }" +
-                    "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".MDNSent." + creationId, notNullValue());
-    }
-
-    @Test
-    void sendMDNShouldFailOnUnknownMessageId() {
-        bartSendMessageToHomer();
-
-        String creationId = "creation-1";
-        String randomMessageId = randomMessageId().serialize();
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                    "    \"messageId\":\"" + randomMessageId + "\"," +
-                    "    \"subject\":\"subject\"," +
-                    "    \"textBody\":\"textBody\"," +
-                    "    \"reportingUA\":\"reportingUA\"," +
-                    "    \"disposition\":{" +
-                    "        \"actionMode\":\"automatic-action\"," +
-                    "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                    "        \"type\":\"processed\"" +
-                    "    }" +
-                    "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".MDNNotSent", hasEntry(
-                equalTo(creationId),
-                hasEntry("type", "invalidArguments")))
-            .body(ARGUMENTS + ".MDNNotSent", hasEntry(
-                equalTo(creationId),
-                hasEntry("description", "Message with id " + randomMessageId + " not found. Thus could not send MDN.")));
-    }
-
-    @Test
-    void sendMDNShouldFailOnInvalidMessages() {
-        sendAWrongInitialMessage();
-        List<String> messageIds = listMessageIdsForAccount(homerAccessToken);
-
-        String creationId = "creation-1";
-
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                    "    \"messageId\":\"" + messageIds.get(0) + "\"," +
-                    "    \"subject\":\"subject\"," +
-                    "    \"textBody\":\"textBody\"," +
-                    "    \"reportingUA\":\"reportingUA\"," +
-                    "    \"disposition\":{" +
-                    "        \"actionMode\":\"automatic-action\"," +
-                    "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                    "        \"type\":\"processed\"" +
-                    "    }" +
-                    "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".MDNNotSent", hasEntry(
-                equalTo(creationId),
-                hasEntry("type", "invalidArguments")))
-            .body(ARGUMENTS + ".MDNNotSent", hasEntry(
-                equalTo(creationId),
-                hasEntry("description", "Origin messageId '" + messageIds.get(0) + "' is invalid. " +
-                    "A Message Delivery Notification can not be generated for it. " +
-                    "Explanation: Disposition-Notification-To header is missing")));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    void sendMDNShouldSendAMDNBackToTheOriginalMessageAuthor() {
-        String bartSentJmapMessageId = bartSendMessageToHomer();
-
-        String homerReceivedMessageId = Iterables.getOnlyElement(listMessageIdsForAccount(homerAccessToken));
-
-        // HOMER sends a MDN back to BART
-        String creationId = "creation-1";
-        with()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                "    \"messageId\":\"" + homerReceivedMessageId + "\"," +
-                "    \"subject\":\"subject\"," +
-                "    \"textBody\":\"Read confirmation\"," +
-                "    \"reportingUA\":\"reportingUA\"," +
-                "    \"disposition\":{" +
-                "        \"actionMode\":\"automatic-action\"," +
-                "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                "        \"type\":\"processed\"" +
-                "    }" +
-                "}" +
-                "}}, \"#0\"]]")
-            .post("/jmap");
-
-        // BART should have received it
-        calmlyAwait.atMost(TWO_MINUTES).until(() -> !listMessageIdsInMailbox(bartAccessToken, getInboxId(bartAccessToken)).isEmpty());
-        String bartInboxMessageIds = Iterables.getOnlyElement(listMessageIdsInMailbox(bartAccessToken, getInboxId(bartAccessToken)));
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", bartAccessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + bartInboxMessageIds + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(firstMessage + ".from.email", is(HOMER.asString()))
-            .body(firstMessage + ".to.email", contains(BART.asString()))
-            .body(firstMessage + ".hasAttachment", is(false))
-            .body(firstMessage + ".textBody", is("Read confirmation"))
-            .body(firstMessage + ".subject", is("subject"))
-            .body(firstMessage + ".headers.Content-Type", startsWith("multipart/report;"))
-            .body(firstMessage + ".headers.X-JAMES-MDN-JMAP-MESSAGE-ID", equalTo(bartSentJmapMessageId));
-    }
-
-    @Test
-    void sendMDNShouldIndicateMissingFields() {
-        String creationId = "creation-1";
-        // Missing subject
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                    "    \"messageId\":\"" + randomMessageId().serialize() + "\"," +
-                    "    \"textBody\":\"textBody\"," +
-                    "    \"reportingUA\":\"reportingUA\"," +
-                    "    \"disposition\":{" +
-                    "        \"actionMode\":\"automatic-action\"," +
-                    "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                    "        \"type\":\"processed\"" +
-                    "    }" +
-                    "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("problem: 'subject' is mandatory"));
-    }
-
-    @Test
-    void sendMDNShouldReturnMaxQuotaReachedWhenUserReachedHisQuota() throws MailboxException {
-        bartSendMessageToHomer();
-
-        List<String> messageIds = listMessageIdsForAccount(homerAccessToken);
-
-        QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-        QuotaRoot inboxQuotaRoot = quotaProbe.getQuotaRoot(MailboxPath.inbox(HOMER));
-        quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100));
-
-        MessageAppender.fillMailbox(jmapServer.getProbe(MailboxProbeImpl.class), HOMER.asString(), MailboxConstants.INBOX);
-
-        String creationId = "creation-1";
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                "    \"messageId\":\"" + messageIds.get(0) + "\"," +
-                "    \"subject\":\"subject\"," +
-                "    \"textBody\":\"textBody\"," +
-                "    \"reportingUA\":\"reportingUA\"," +
-                "    \"disposition\":{" +
-                "        \"actionMode\":\"automatic-action\"," +
-                "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                "        \"type\":\"processed\"" +
-                "    }" +
-                "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".MDNNotSent", hasEntry(
-                equalTo(creationId),
-                hasEntry("type", "maxQuotaReached")));
-    }
-
-    @Test
-    void sendMDNShouldIndicateMissingFieldsInDisposition() {
-        String creationId = "creation-1";
-        // Missing actionMode
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                "    \"messageId\":\"" + randomMessageId().serialize() + "\"," +
-                "    \"subject\":\"subject\"," +
-                "    \"textBody\":\"textBody\"," +
-                "    \"reportingUA\":\"reportingUA\"," +
-                "    \"disposition\":{" +
-                "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                "        \"type\":\"processed\"" +
-                "    }" +
-                "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("problem: 'actionMode' is mandatory"));
-    }
-
-    @Test
-    void invalidEnumValuesInMDNShouldBeReported() {
-        String creationId = "creation-1";
-        given()
-            .header("Authorization", homerAccessToken.asString())
-            .body("[[\"setMessages\", {\"sendMDN\": {" +
-                "\"" + creationId + "\":{" +
-                "    \"messageId\":\"" + randomMessageId().serialize() + "\"," +
-                "    \"subject\":\"subject\"," +
-                "    \"textBody\":\"textBody\"," +
-                "    \"reportingUA\":\"reportingUA\"," +
-                "    \"disposition\":{" +
-                "        \"actionMode\":\"invalid\"," +
-                "        \"sendingMode\":\"MDN-sent-automatically\"," +
-                "        \"type\":\"processed\"" +
-                "    }" +
-                "}" +
-                "}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("Unrecognized MDN Disposition action mode invalid. Should be one of [manual-action, automatic-action]"));
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
deleted file mode 100644
index 1c0c72c47ad..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
+++ /dev/null
@@ -1,2439 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static io.restassured.http.ContentType.JSON;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.FIRST_MAILBOX;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
-
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.mailbox.model.MailboxACL.Right;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.modules.ACLProbeImpl;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import io.restassured.RestAssured;
-import io.restassured.response.Response;
-
-public abstract class SetMailboxesMethodTest {
-
-    private static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter());
-    private static final String WRITE = String.valueOf(Right.Write.asCharacter());
-    private static final String DELETE_MESSAGES = String.valueOf(Right.DeleteMessages.asCharacter());
-
-    private static final int MAILBOX_NAME_LENGTH_64K = 65536;
-    private MailboxId draftId;
-    private MailboxId outboxId;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken accessToken;
-    private Username username;
-    private GuiceJamesServer jmapServer;
-    private MailboxProbe mailboxProbe;
-    private MailboxId inboxId;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-
-        username = Username.of("username@" + DOMAIN);
-        String password = "password";
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(username.asString(), password);
-        inboxId = mailboxProbe.createMailbox("#private", username.asString(), DefaultMailboxes.INBOX);
-        outboxId = mailboxProbe.createMailbox("#private", username.asString(), DefaultMailboxes.OUTBOX);
-        mailboxProbe.createMailbox("#private", username.asString(), DefaultMailboxes.TRASH);
-        mailboxProbe.createMailbox("#private", username.asString(), DefaultMailboxes.SENT);
-        draftId = mailboxProbe.createMailbox("#private", username.asString(), DefaultMailboxes.DRAFTS);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), username, password);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    @Category(CassandraAndOpenSearchCategory.class)
-    public void setMailboxesShouldNotCreateWhenOverLimitName() {
-        String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K);
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"" + overLimitName + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox name length is too long")))));
-    }
-
-    @Test
-    @Category(CassandraAndOpenSearchCategory.class)
-    public void setMailboxesShouldNotUpdateMailboxWhenOverLimitName() {
-        String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K);
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"name\" : \"" + overLimitName + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox name length is too long")))));
-    }
-
-    @Test
-    public void setMailboxesCreateShouldFailWhenOverLimitName() {
-        String overLimitName = StringUtils.repeat("a", MailboxManager.MAX_MAILBOX_NAME_LENGTH + 1);
-        String creationId = "create-id01";
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"" + creationId + "\" : {" +
-                "          \"name\" : \"" + overLimitName + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(creationId))
-            .body(ARGUMENTS + ".notCreated." + creationId + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".notCreated." + creationId + ".description", is("The mailbox name length is too long"));
-    }
-
-    @Test
-    public void setMailboxesCreateShouldFailWhenBlankName() {
-        String creationId = "create-id01";
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"" + creationId + "\" : {" +
-                "          \"name\" : \"        \"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(creationId))
-            .body(ARGUMENTS + ".notCreated." + creationId + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".notCreated." + creationId + ".description", is("'#private:username@domain.tld:        ' has an empty part within its mailbox name considering . as a delimiter"));
-    }
-
-    @Test
-    public void setMailboxesUpdateShouldFailWhenOverLimitName() throws Exception {
-        String overLimitName = StringUtils.repeat("a", MailboxManager.MAX_MAILBOX_NAME_LENGTH + 1);
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"name\" : \"" + overLimitName + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasKey(mailboxId.serialize()))
-            .body(ARGUMENTS + ".notUpdated." + mailboxId.serialize() + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".notUpdated." + mailboxId.serialize() + ".description", is("The mailbox name length is too long"));
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString())).doesNotContain(overLimitName);
-    }
-
-    @Test
-    public void setMailboxesUpdateShouldFailWhenBlankName() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"name\" : \"    \"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasKey(mailboxId.serialize()))
-            .body(ARGUMENTS + ".notUpdated." + mailboxId.serialize() + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".notUpdated." + mailboxId.serialize() + ".description", is("'#private:username@domain.tld:    ' has an empty part within its mailbox name considering . as a delimiter"));
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString())).doesNotContain("    ");
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void userShouldBeSubscribedOnCreatedMailboxWhenCreateMailbox() throws Exception {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", hasKey("create-id01"));
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString())).contains("foo");
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void userShouldGetAnErrorWhenNotBeAbleToCreateACaseVariationOfINBOX() throws Exception {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"iNbOx\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey("create-id01"))
-            .body(ARGUMENTS + ".notCreated.create-id01.type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".notCreated.create-id01.description", equalTo("The mailbox 'iNbOx' already exists as 'INBOX'"));
-
-        assertThat(mailboxProbe.listUserMailboxes(username.asString())).doesNotContain("iNbOx");
-    }
-
-    @Test
-    public void userShouldBeSubscribedOnCreatedMailboxWhenCreateChildOfInboxMailbox() throws Exception {
-        MailboxId inboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), MailboxConstants.INBOX);
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"parentId\" : \"" + inboxId.serialize() + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString())).contains(DefaultMailboxes.INBOX + ".foo");
-    }
-
-    @Test
-    public void subscriptionUserShouldBeChangedWhenUpdateMailbox() throws Exception {
-        String initialMailboxName = "myBox";
-        String mailboxId = createMailBoxThroughJMAP(initialMailboxName);
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"name\" : \"mySecondBox\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .contains("mySecondBox")
-            .doesNotContain(initialMailboxName);
-    }
-
-    @Test
-    public void subscriptionUserShouldBeChangedWhenUpdateParentMailbox() throws Exception {
-        MailboxId parentId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root");
-
-        String secondMailboxName = "second";
-        String secondMailboxId = createSubMailBox(parentId.serialize(), secondMailboxName);
-
-        String thirdMailBoxName = "third";
-        String thirdMailboxId = createSubMailBox(secondMailboxId, thirdMailBoxName);
-
-        String fourthMailboxName = "fourth";
-        createSubMailBox(thirdMailboxId, fourthMailboxName);
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + thirdMailboxId + "\" : {" +
-                "          \"name\" : \"thirdtest\" ,"  +
-                "          \"parentId\" : \"" + secondMailboxId + "\""  +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .contains("root.second.thirdtest.fourth")
-            .doesNotContain("root.second.third.fourth");
-    }
-
-    @Test
-    public void subscriptionUserShouldBeChangedForAllChildrenWhenUpdateParentMailbox() throws Exception {
-        MailboxId parentId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root");
-
-        String secondMailboxName = "second";
-        String secondMailboxId = createSubMailBox(parentId.serialize(), secondMailboxName);
-
-        String thirdMailBoxName = "third";
-        String thirdMailboxId = createSubMailBox(secondMailboxId, thirdMailBoxName);
-
-        String fourthMailboxName = "fourth";
-        createSubMailBox(thirdMailboxId, fourthMailboxName);
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + secondMailboxId + "\" : {" +
-                "          \"name\" : \"secondtest\" ,"  +
-                "          \"parentId\" : \"" + parentId.serialize() + "\""  +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .contains("root.secondtest.third.fourth")
-            .doesNotContain("root.second.third.fourth");
-    }
-
-    private String createSubMailBox(String parentMailboxId, String childMailboxName) {
-        String clientIdentifier = "whatever";
-        String createChildMailbox =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"" + clientIdentifier + "\" : {" +
-                "          \"name\" : \"" + childMailboxName + "\"," +
-                "          \"parentId\" : \"" + parentMailboxId + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        Response response = given()
-            .header("Authorization", accessToken.asString())
-            .body(createChildMailbox)
-        .when()
-            .post("/jmap")
-        .then()
-            .contentType(JSON)
-        .extract()
-            .response();
-
-        return response.jsonPath().get("[0][1].created." + clientIdentifier + ".id");
-    }
-
-    private String createMailBoxThroughJMAP(String mailboxName) {
-        String clientIdentifier = "whatever";
-        String createMailbox =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"" + clientIdentifier + "\" : {" +
-                "          \"name\" : \"" + mailboxName + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        Response response = given()
-            .header("Authorization", accessToken.asString())
-            .body(createMailbox)
-        .when()
-            .post("/jmap")
-        .then()
-            .contentType(JSON)
-        .extract()
-            .response();
-
-        return response.jsonPath().get("[0][1].created." + clientIdentifier + ".id");
-    }
-
-    @Test
-    public void subscriptionUserShouldBeChangedWhenCreateThenUpdateMailboxNameWithJMAP() throws Exception {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", hasKey("create-id01"));
-
-        String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), "foo").serialize();
-
-        requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"name\" : \"mySecondBox\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .contains("mySecondBox");
-    }
-
-    @Test
-    public void subscriptionUserShouldBeDeletedWhenDestroyMailbox() throws Exception {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .isEmpty();
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void subscriptionUserShouldBeDeletedWhenCreateThenDestroyMailboxWithJMAP() throws Exception {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", hasKey("create-id01"));
-
-        MailboxId mailbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), "foo");
-
-        requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailbox.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        assertThat(mailboxProbe.listSubscriptions(username.asString()))
-            .isEmpty();
-    }
-
-    @Test
-    public void setMailboxesShouldErrorNotSupportedWhenRoleGiven() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"role\" : \"Inbox\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'role' of 'MailboxCreateRequest' is not supported"));
-    }
-
-    @Test
-    public void setMailboxesShouldErrorNotSupportedWhenSortOrderGiven() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"sortOrder\" : 11" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'sortOrder' of 'MailboxCreateRequest' is not supported"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMailboxesShouldReturnCreatedMailbox() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", hasKey("create-id01"));
-    }
-
-    @Test
-    public void setMailboxesShouldCreateMailbox() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasItem("foo"));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnCreatedMailboxWhenChildOfInboxMailbox() {
-        String inboxId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMailboxes\", {}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .extract()
-                .jsonPath()
-                .getString(ARGUMENTS + ".list[0].id");
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"parentId\" : \"" + inboxId + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("parentId"), equalTo(inboxId)),
-                    hasEntry(equalTo("name"), equalTo("foo")))));
-    }
-
-    @Test
-    public void setMailboxesShouldCreateMailboxWhenChildOfInboxMailbox() {
-        MailboxId inboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), MailboxConstants.INBOX);
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"parentId\" : \"" + inboxId.serialize() + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", hasItem("foo"));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotCreatedWhenInvalidParentId() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"foo\"," +
-                "          \"parentId\" : \"123\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The parent mailbox '123' was not found.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnCreatedMailboxWhenCreatingParentThenChildMailboxes() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id00\" : {" +
-                "          \"name\" : \"parent\"" +
-                "        }," +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"child\"," +
-                "          \"parentId\" : \"create-id00\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(2))
-            .body(ARGUMENTS + ".created", hasEntry(equalTo("create-id00"), Matchers.allOf(
-                    hasEntry(equalTo("parentId"), is(nullValue())),
-                    hasEntry(equalTo("name"), equalTo("parent")))))
-            .body(ARGUMENTS + ".created", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("parentId"), not(is(nullValue()))),
-                    hasEntry(equalTo("name"), equalTo("child")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnCreatedMailboxWhenCreatingChildThenParentMailboxes() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"child\"," +
-                "          \"parentId\" : \"create-id00\"" +
-                "        }," +
-                "        \"create-id00\" : {" +
-                "          \"name\" : \"parent\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(2))
-            .body(ARGUMENTS + ".created", hasEntry(equalTo("create-id00"), Matchers.allOf(
-                    hasEntry(equalTo("parentId"), is(nullValue())),
-                    hasEntry(equalTo("name"), equalTo("parent")))))
-            .body(ARGUMENTS + ".created", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("parentId"), not(is(nullValue()))),
-                    hasEntry(equalTo("name"), equalTo("child")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotCreatedWhenMailboxAlreadyExists() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"myBox\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox 'create-id01' already exists.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotCreatedWhenCycleDetected() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"create\": {" +
-                "        \"create-id01\" : {" +
-                "          \"name\" : \"A\"," +
-                "          \"parentId\" : \"create-id02\"" +
-                "        }," +
-                "        \"create-id02\" : {" +
-                "          \"name\" : \"B\"," +
-                "          \"parentId\" : \"create-id01\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(2))
-            .body(ARGUMENTS + ".notCreated", Matchers.allOf(
-                    hasEntry(equalTo("create-id01"), Matchers.allOf(
-                        hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                        hasEntry(equalTo("description"), equalTo("The created mailboxes introduce a cycle.")))),
-                    hasEntry(equalTo("create-id02"), Matchers.allOf(
-                            hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                            hasEntry(equalTo("description"), equalTo("The created mailboxes introduce a cycle."))))
-                    ));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotCreatedWhenMailboxNameContainsPathDelimiter() {
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"create\": {" +
-                    "        \"create-id01\" : {" +
-                    "          \"name\" : \"A.B.C.D\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-            given()
-                .header("Authorization", accessToken.asString())
-                .body(requestBody)
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("mailboxesSet"))
-                .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-                .body(ARGUMENTS + ".notCreated", hasEntry(equalTo("create-id01"), Matchers.allOf(
-                            hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                            hasEntry(equalTo("description"), equalTo("The mailbox 'A.B.C.D' contains an illegal character: '.'")))
-                        ));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMailboxesShouldReturnDestroyedMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".destroyed", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldDestroyMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list.name", not(hasItem("myBox")));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotDestroyedWhenMailboxDoesntExist() {
-        String nonExistantMailboxId = getRemovedMailboxId().serialize();
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + nonExistantMailboxId + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notDestroyed", aMapWithSize(1))
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(nonExistantMailboxId), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("notFound")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox '" + nonExistantMailboxId + "' was not found.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotDestroyedWhenMailboxHasChild() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox.child");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notDestroyed", aMapWithSize(1))
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("mailboxHasChild")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox '" + mailboxId.serialize() + "' has a child.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotDestroyedWhenSystemMailbox() {
-        String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), MailboxConstants.INBOX).serialize();
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + mailboxId + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notDestroyed", aMapWithSize(1))
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(mailboxId), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox '" + mailboxId + "' is a system mailbox.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnDestroyedWhenParentThenChildMailboxes() {
-        MailboxId parentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "parent");
-        MailboxId childMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "parent.child");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + parentMailboxId.serialize() + "\",\"" + childMailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".destroyed", containsInAnyOrder(parentMailboxId.serialize(), childMailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnDestroyedWhenChildThenParentMailboxes() {
-        MailboxId parentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "parent");
-        MailboxId childMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "parent.child");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"destroy\": [\"" + childMailboxId.serialize() + "\",\"" + parentMailboxId.serialize() + "\"]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".destroyed", containsInAnyOrder(parentMailboxId.serialize(), childMailboxId.serialize()));
-    }
-
-    private MailboxId getRemovedMailboxId() {
-        MailboxId removedId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "quicklyRemoved");
-        mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "quicklyRemoved");
-        return removedId;
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenUnknownMailbox() {
-        String unknownMailboxId = getRemovedMailboxId().serialize();
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + unknownMailboxId + "\" : {" +
-                    "          \"name\" : \"yolo\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(unknownMailboxId), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("notFound")),
-                    hasEntry(equalTo("description"), containsString(unknownMailboxId)))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnUpdatedMailboxIdWhenNoUpdateAskedOnExistingMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMailboxesShouldReturnUpdatedWhenNameUpdateAskedOnExistingMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"myRenamedBox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void updateShouldReturnOkWhenClearingSharedWith() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void updateShouldReturnOkWhenSettingNewACL() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void updateShouldRejectInvalidRights() {
-        String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class)
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox")
-            .serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"sharedWith\" : {\"user\": [\"aw\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-        .when()
-            .post("/jmap").prettyPeek()
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("Rights should be represented as single value characters"));
-    }
-
-    @Test
-    public void updateShouldRejectUnhandledRight() {
-        String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class)
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox")
-            .serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"sharedWith\" : {\"user\": [\"p\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("No matching right for 'p'"));
-    }
-
-    @Test
-    public void updateShouldRejectNonExistingRights() {
-        String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class)
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox")
-            .serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"sharedWith\" : {\"user\": [\"z\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", is("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("No matching right for 'z'"));
-    }
-
-    @Test
-    public void updateShouldApplyWhenSettingNewACL() {
-        String myBox = "myBox";
-        String user = "user@" + DOMAIN;
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), myBox);
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(myBox))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(user, ImmutableList.of(ADMINISTER, WRITE)));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void updateShouldModifyStoredDataWhenUpdatingACL() {
-        String myBox = "myBox";
-        String user = "user@" + DOMAIN;
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), myBox);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user + "\": [\"a\", \"t\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(myBox))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(user, ImmutableList.of(ADMINISTER, DELETE_MESSAGES)));
-    }
-
-    @Test
-    public void updateShouldClearStoredDataWhenDeleteACL() {
-        String myBox = "myBox";
-        String user = "user";
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), myBox);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(myBox))
-            .body(FIRST_MAILBOX + ".sharedWith", is(ImmutableMap.of()));
-    }
-
-    @Test
-    public void updateShouldModifyStoredDataWhenSwitchingACLUser() {
-        String myBox = "myBox";
-        String user1 = "user1@" + DOMAIN;
-        String user2 = "user2@" + DOMAIN;
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), myBox);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user1 + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + user2 + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".name", equalTo(myBox))
-            .body(FIRST_MAILBOX + ".sharedWith", hasEntry(user2, ImmutableList.of(ADMINISTER, WRITE)));
-    }
-
-    @Test
-    public void updateShouldFilterOwnerACL() throws Exception {
-        String myBox = "myBox";
-        String user2 = "user2";
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), myBox);
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"" + username.asString() + "\": [\"a\", \"w\"]," +
-                "                            \"" + user2 + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-            .post("/jmap");
-
-        MailboxACL acl = jmapServer.getProbe(ACLProbeImpl.class)
-            .retrieveRights(MailboxPath.forUser(username, myBox));
-
-        assertThat(acl.getEntries())
-            .doesNotContainKeys(MailboxACL.EntryKey.createUserEntryKey(username));
-    }
-
-    @Test
-    public void setMailboxesShouldUpdateMailboxNameWhenNameUpdateAskedOnExistingMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"myRenamedBox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].name", equalTo("myRenamedBox"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMailboxesShouldReturnMailboxIdWhenMovingToAnotherParentMailbox() {
-        MailboxId mailboxId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-
-        MailboxId chosenMailboxParentId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myChosenParentBox");
-        
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + chosenMailboxParentId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldUpdateMailboxParentIdWhenMovingToAnotherParentMailbox() {
-        MailboxId mailboxId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-
-        MailboxId newParentMailboxId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].parentId", equalTo(newParentMailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnMailboxIdWhenParentIdUpdateAskedOnExistingMailbox() {
-        mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-
-        MailboxId mailboxId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-
-        MailboxId newParentMailboxId = mailboxProbe
-            .createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldUpdateMailboxParentIdWhenParentIdUpdateAskedOnExistingMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-
-        MailboxId newParentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].parentId", equalTo(newParentMailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnMailboxIdWhenParentIdUpdateAskedAsOrphanForExistingMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : null" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldUpdateParentIdWhenAskedAsOrphanForExistingMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : null" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].parentId", nullValue());
-    }
-
-    @Test
-    public void setMailboxesShouldReturnMailboxIdWhenNameAndParentIdUpdateForExistingMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-        MailboxId newParentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"myRenamedBox\", " +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShoulUpdateMailboxIAndParentIddWhenBothUpdatedForExistingMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox");
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myPreviousParentBox.myBox");
-        MailboxId newParentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"myRenamedBox\", " +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].parentId",equalTo(newParentMailboxId.serialize()))
-            .body(ARGUMENTS + ".list[0].name",equalTo("myRenamedBox"));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenNameContainsPathDelimiter() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"my.Box\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox 'my.Box' contains an illegal character: '.'"))))); 
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenNewParentDoesntExist() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-        String badParentId = getRemovedMailboxId().serialize();
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + badParentId + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("notFound")),
-                    hasEntry(equalTo("description"), containsString(badParentId)))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenUpdatingParentIdOfAParentMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root");
-
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root.myBox");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root.myBox.child");
-        MailboxId newParentMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myNewParentBox");
-
-
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"parentId\" : \"" + newParentMailboxId.serialize() + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("Cannot update a parent mailbox."))))); 
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenRenamingAMailboxToAnAlreadyExistingMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "mySecondBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"mySecondBox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("Cannot rename a mailbox to an already existing mailbox."))))); 
-    }
-
-    @Test
-    public void setMailboxesShouldReturnUpdatedWhenRenamingAChildMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root");
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root.myBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"mySecondBox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(mailboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldUpdateMailboxNameWhenRenamingAChildMailbox() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root");
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "root.myBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"mySecondBox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {\"ids\": [\"" + mailboxId.serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].name", equalTo("mySecondBox"));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenRenamingSystemMailbox() {
-        String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username.asString(), MailboxConstants.INBOX).serialize();
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId + "\" : {" +
-                    "          \"name\" : \"renamed\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("Cannot update a system mailbox.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenRenameToSystemMailboxName() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"Outbox\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxId.serialize()), Matchers.allOf(
-                    hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                    hasEntry(equalTo("description"), equalTo("The mailbox 'Outbox' is a system mailbox.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedErrorWhenMovingMailboxTriggersNameConflict() {
-        MailboxId mailboxRootAId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "A");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "A.B");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "A.C");
-        MailboxId mailboxChildToMoveCId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "A.B.C");
-
-        String requestBody =
-              "[" +
-                  "  [ \"setMailboxes\"," +
-                  "    {" +
-                  "      \"update\": {" +
-                  "        \"" + mailboxChildToMoveCId.serialize() + "\" : {" +
-                  "          \"parentId\" : \"" + mailboxRootAId.serialize() + "\"" +
-                  "        }" +
-                  "      }" +
-                  "    }," +
-                  "    \"#0\"" +
-                  "  ]" +
-                  "]";
-
-      given()
-          .header("Authorization", accessToken.asString())
-          .body(requestBody)
-      .when()
-          .post("/jmap")
-      .then()
-          .statusCode(200)
-          .body(NAME, equalTo("mailboxesSet"))
-          .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(mailboxChildToMoveCId.serialize()), Matchers.allOf(
-                  hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                  hasEntry(equalTo("description"), equalTo("Cannot rename a mailbox to an already existing mailbox.")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnUpdatedWhenShareSystemMailbox() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + inboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".updated", contains(inboxId.serialize()));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenShareOutboxMailbox() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + outboxId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(outboxId.serialize()), Matchers.allOf(
-                hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                hasEntry(equalTo("description"), equalTo("Sharing 'Outbox' is forbidden")))));
-    }
-
-    @Test
-    public void setMailboxesShouldReturnNotUpdatedWhenShareDraftMailbox() {
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + draftId.serialize() + "\" : {" +
-                "          \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxesSet"))
-            .body(ARGUMENTS + ".notUpdated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notUpdated", hasEntry(equalTo(draftId.serialize()), Matchers.allOf(
-                hasEntry(equalTo("type"), equalTo("invalidArguments")),
-                hasEntry(equalTo("description"), equalTo("Sharing 'Draft' is forbidden")))));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java
deleted file mode 100644
index 5544adb455b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.config.EncoderConfig.encoderConfig;
-import static io.restassured.config.RestAssuredConfig.newConfig;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JmapCommonRequests.bodyOfMessage;
-import static org.apache.james.jmap.JmapCommonRequests.getLatestMessageId;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.receiversOfMessage;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Durations.FIVE_HUNDRED_MILLISECONDS;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.mailbox.Role;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import io.restassured.RestAssured;
-import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.http.ContentType;
-import io.restassured.parsing.Parser;
-
-public abstract class SetMessagesMethodReRoutingTest {
-    private static final String PASSWORD = "password";
-
-    private static final String DESTINATION_DOMAIN = "domain1.com";
-    private static final String ALIAS_DOMAIN = "domain2.com";
-    private static final String RECEIVER_AT_DESTINATION_DOMAIN = "user@domain1.com";
-    private static final String RECEIVER_AT_ALIAS_DOMAIN = "user@domain2.com";
-    private static final String SENDER_AT_DESTINATION_DOMAIN = "sender@domain1.com";
-
-    private AccessToken receiverAtDestinationDomainToken;
-    private AccessToken senderAtDestinationDomainToken;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private GuiceJamesServer jmapServer;
-    private MailboxProbe mailboxProbe;
-    private DataProbe dataProbe;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-
-        RestAssured.requestSpecification = new RequestSpecBuilder()
-                .setContentType(ContentType.JSON)
-                .setAccept(ContentType.JSON)
-                .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-        RestAssured.defaultParser = Parser.JSON;
-
-        dataProbe.addDomain(DESTINATION_DOMAIN);
-        dataProbe.addDomain(ALIAS_DOMAIN);
-        dataProbe.addUser(RECEIVER_AT_DESTINATION_DOMAIN, PASSWORD);
-        dataProbe.addUser(SENDER_AT_DESTINATION_DOMAIN, PASSWORD);
-        receiverAtDestinationDomainToken = authenticateJamesUser(baseUri(jmapServer), Username.of(RECEIVER_AT_DESTINATION_DOMAIN), PASSWORD);
-        senderAtDestinationDomainToken = authenticateJamesUser(baseUri(jmapServer), Username.of(SENDER_AT_DESTINATION_DOMAIN), PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test // MAILET-136
-    public void sendShouldReRouteMailToDestinationAddressWhenDomainAliasMapping() throws Exception {
-        dataProbe.addDomainAliasMapping(ALIAS_DOMAIN, DESTINATION_DOMAIN);
-
-        String messageContent = "content content";
-        String sendMessageBody =
-            "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"creationId1337\" : {" +
-            "        \"from\": { \"name\": \"Sender\", \"email\": \"" + SENDER_AT_DESTINATION_DOMAIN + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + RECEIVER_AT_ALIAS_DOMAIN + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"" + messageContent + "\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(senderAtDestinationDomainToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-        given()
-            .header("Authorization", senderAtDestinationDomainToken.asString())
-            .body(sendMessageBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-
-        calmlyAwait
-            .pollDelay(FIVE_HUNDRED_MILLISECONDS)
-            .atMost(30, TimeUnit.SECONDS)
-            .untilAsserted(() ->
-                assertThat(getLatestMessageId(receiverAtDestinationDomainToken, Role.INBOX))
-                    .isNotNull());
-
-        String inboxMessageId = getLatestMessageId(receiverAtDestinationDomainToken, Role.INBOX);
-        assertThat(bodyOfMessage(receiverAtDestinationDomainToken, inboxMessageId))
-            .isEqualTo(messageContent);
-    }
-
-    @Test // MAILET-136
-    public void sendShouldNotCreateNewUserOrMailboxOfAliasAddressWhenDomainAliasMapping() throws Exception {
-        dataProbe.addDomainAliasMapping(ALIAS_DOMAIN, DESTINATION_DOMAIN);
-
-        String messageContent = "content content";
-        String sendMessageBody =
-            "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"creationId1337\" : {" +
-            "        \"from\": { \"name\": \"Sender\", \"email\": \"" + SENDER_AT_DESTINATION_DOMAIN + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + RECEIVER_AT_ALIAS_DOMAIN + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"" + messageContent + "\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(senderAtDestinationDomainToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-        given()
-            .header("Authorization", senderAtDestinationDomainToken.asString())
-            .body(sendMessageBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-
-        calmlyAwait
-            .pollDelay(FIVE_HUNDRED_MILLISECONDS)
-            .atMost(30, TimeUnit.SECONDS)
-            .untilAsserted(() ->
-                assertThat(getLatestMessageId(receiverAtDestinationDomainToken, Role.INBOX))
-                    .isNotNull());
-
-        assertThat(dataProbe.listUsers())
-            .doesNotContain("user@domain2.com");
-        assertThat(mailboxProbe.listUserMailboxes("user@domain2.com"))
-            .isEmpty();
-    }
-
-
-    @Test // MAILET-136
-    public void sendShouldSaveToAsTheAliasAddressWhenDomainAliasMapping() throws Exception {
-        dataProbe.addDomainAliasMapping(ALIAS_DOMAIN, DESTINATION_DOMAIN);
-
-        String messageContent = "content content";
-        String sendMessageBody =
-            "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"creationId1337\" : {" +
-            "        \"from\": { \"name\": \"Sender\", \"email\": \"" + SENDER_AT_DESTINATION_DOMAIN + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + RECEIVER_AT_ALIAS_DOMAIN + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"" + messageContent + "\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(senderAtDestinationDomainToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-        given()
-            .header("Authorization", senderAtDestinationDomainToken.asString())
-            .body(sendMessageBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-
-        calmlyAwait
-            .pollDelay(FIVE_HUNDRED_MILLISECONDS)
-            .atMost(30, TimeUnit.SECONDS)
-            .untilAsserted(() ->
-                assertThat(getLatestMessageId(senderAtDestinationDomainToken, Role.SENT))
-                    .isNotNull());
-
-        String sentMessageId = getLatestMessageId(senderAtDestinationDomainToken, Role.SENT);
-        assertThat(receiversOfMessage(senderAtDestinationDomainToken, sentMessageId))
-            .containsOnly(RECEIVER_AT_ALIAS_DOMAIN);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
deleted file mode 100644
index de65cf9a3c4..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
+++ /dev/null
@@ -1,6320 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static io.restassured.config.EncoderConfig.encoderConfig;
-import static io.restassured.config.RestAssuredConfig.newConfig;
-import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE;
-import static org.apache.james.jmap.JMAPTestingConstants.ALICE_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN_ALIAS;
-import static org.apache.james.jmap.JMAPTestingConstants.FIRST_MAILBOX;
-import static org.apache.james.jmap.JMAPTestingConstants.LOCALHOST_IP;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.SECOND_ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.SECOND_NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.jmap.JmapCommonRequests.getDraftId;
-import static org.apache.james.jmap.JmapCommonRequests.getInboxId;
-import static org.apache.james.jmap.JmapCommonRequests.getMailboxId;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.getSentId;
-import static org.apache.james.jmap.JmapCommonRequests.getSetMessagesUpdateOKResponseAssertions;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.startsWith;
-import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
-import static org.hamcrest.collection.IsMapWithSize.anEmptyMap;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import jakarta.mail.Flags;
-import jakarta.mail.Flags.Flag;
-import jakarta.mail.internet.MimeMessage;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Domain;
-import org.apache.james.core.Username;
-import org.apache.james.core.quota.QuotaSizeLimit;
-import org.apache.james.events.Event;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.HttpJmapAuthentication;
-import org.apache.james.jmap.JmapCommonRequests;
-import org.apache.james.jmap.MessageAppender;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.jmap.MessageIdProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.FlagsBuilder;
-import org.apache.james.mailbox.Role;
-import org.apache.james.mailbox.events.MailboxEvents.Added;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.AttachmentMetadata;
-import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.model.MessageResult;
-import org.apache.james.mailbox.model.QuotaRoot;
-import org.apache.james.mailbox.model.StringBackedAttachmentId;
-import org.apache.james.mailbox.probe.ACLProbe;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.mailbox.probe.QuotaProbe;
-import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
-import org.apache.james.mailbox.util.EventCollector;
-import org.apache.james.modules.ACLProbeImpl;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.modules.QuotaProbesImpl;
-import org.apache.james.modules.protocols.ImapGuiceProbe;
-import org.apache.james.modules.protocols.SmtpGuiceProbe;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.util.ClassLoaderUtils;
-import org.apache.james.util.MimeMessageUtil;
-import org.apache.james.util.io.ZeroedInputStream;
-import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.SMTPMessageSender;
-import org.apache.james.utils.TestIMAPClient;
-import org.apache.mailet.Mail;
-import org.apache.mailet.base.test.FakeMail;
-import org.assertj.core.api.SoftAssertions;
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.io.ByteStreams;
-
-import io.restassured.RestAssured;
-import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.filter.log.LogDetail;
-import io.restassured.http.ContentType;
-import io.restassured.parsing.Parser;
-import io.restassured.path.json.JsonPath;
-import net.javacrumbs.jsonunit.core.Option;
-import net.javacrumbs.jsonunit.core.internal.Options;
-
-public abstract class SetMessagesMethodTest {
-    private static final String FORWARDED = "$Forwarded";
-    private static final int _1MB = 1024 * 1024;
-    protected static final Username USERNAME = Username.of("username@" + DOMAIN);
-    private static final String ALIAS_OF_USERNAME_MAIL = "alias@" + DOMAIN;
-    private static final String GROUP_MAIL = "group@" + DOMAIN;
-    private static final Username ALIAS_OF_USERNAME = Username.of(ALIAS_OF_USERNAME_MAIL);
-    private static final String PASSWORD = "password";
-    protected static final MailboxPath USER_MAILBOX = MailboxPath.forUser(USERNAME, "mailbox");
-    private static final String NOT_UPDATED = ARGUMENTS + ".notUpdated";
-    private static final int BIG_MESSAGE_SIZE = 9 * 1024 * 1024;
-    public static final String OCTET_CONTENT_TYPE = "application/octet-stream";
-    public static final String OCTET_CONTENT_TYPE_UTF8 = "application/octet-stream; charset=UTF-8";
-
-    private AccessToken bobAccessToken;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    protected abstract MessageId randomMessageId();
-
-    protected AccessToken accessToken;
-    protected GuiceJamesServer jmapServer;
-    protected MailboxProbe mailboxProbe;
-    private DataProbe dataProbe;
-    protected MessageIdProbe messageProbe;
-    private ACLProbe aclProbe;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        messageProbe = jmapServer.getProbe(MessageIdProbe.class);
-        aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
-
-        RestAssured.requestSpecification = new RequestSpecBuilder()
-                .setContentType(ContentType.JSON)
-                .setAccept(ContentType.JSON)
-                .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-        RestAssured.defaultParser = Parser.JSON;
-
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(USERNAME.asString(), PASSWORD);
-        dataProbe.addUser(BOB.asString(), BOB_PASSWORD);
-
-        mailboxProbe.createMailbox("#private", USERNAME.asString(), DefaultMailboxes.INBOX);
-        accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), USERNAME, PASSWORD);
-        bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void setMessagesShouldReturnAnErrorNotSupportedWhenRequestContainsNonNullAccountId() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"accountId\": \"1\"}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'SetMessagesRequest' is not supported"));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAnErrorNotSupportedWhenRequestContainsNonNullIfInState() {
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"ifInState\": \"1\"}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'ifInState' of 'SetMessagesRequest' is not supported"));
-    }
-
-    @Test
-    public void setMessagesShouldReturnNotDestroyedWhenUnknownMailbox() {
-
-        String unknownMailboxMessageId = randomMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"destroy\": [\"" + unknownMailboxMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".destroyed", empty())
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(unknownMailboxMessageId), Matchers.allOf(
-                hasEntry("type", "notFound"),
-                hasEntry("description", "The message " + unknownMailboxMessageId + " can't be found"),
-                hasEntry(equalTo("properties"), is(nullValue()))))
-            );
-    }
-
-    @Test
-    public void setMessagesShouldReturnNotDestroyedWhenNoMatchingMessage() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        String messageId = randomMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"destroy\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".destroyed", empty())
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(messageId), Matchers.allOf(
-                hasEntry("type", "notFound"),
-                hasEntry("description", "The message " + messageId + " can't be found"),
-                hasEntry(equalTo("properties"), is(nullValue()))))
-            );
-    }
-
-    @Test
-    public void setMessagesShouldReturnDestroyedWhenMatchingMessage() throws Exception {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"destroy\": [\"" + message.getMessageId().serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notDestroyed", anEmptyMap())
-            .body(ARGUMENTS + ".destroyed", hasSize(1))
-            .body(ARGUMENTS + ".destroyed", contains(message.getMessageId().serialize()));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldDeleteMessageWhenMatchingMessage() throws Exception {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        // When
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"setMessages\", {\"destroy\": [\"" + message.getMessageId().serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200);
-
-        // Then
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + message.getMessageId().serialize() + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", empty());
-    }
-
-    @Test
-    public void setMessagesShouldReturnDestroyedNotDestroyWhenMixed() throws Exception {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String missingMessageId = randomMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"destroy\": [\"%s\", \"%s\", \"%s\"]}, \"#0\"]]",
-                message1.getMessageId().serialize(),
-                missingMessageId,
-                message3.getMessageId().serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".destroyed", hasSize(2))
-            .body(ARGUMENTS + ".notDestroyed", aMapWithSize(1))
-            .body(ARGUMENTS + ".destroyed", containsInAnyOrder(message1.getMessageId().serialize(), message3.getMessageId().serialize()))
-            .body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(missingMessageId), Matchers.allOf(
-                hasEntry("type", "notFound"),
-                hasEntry("description", "The message " + missingMessageId + " can't be found")))
-            );
-    }
-
-    @Test
-    public void setMessagesShouldDeleteMatchingMessagesWhenMixed() throws Exception {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        ComposedMessageId message2 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        // When
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"destroy\": [\"%s\", \"%s\", \"%s\"]}, \"#0\"]]",
-                message1.getMessageId().serialize(),
-                randomMessageId().serialize(),
-                message3.getMessageId().serialize()))
-        .post("/jmap");
-
-        // Then
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"getMessages\", {\"ids\": [\"%s\", \"%s\", \"%s\"]}, \"#0\"]]",
-                message1.getMessageId().serialize(),
-                message2.getMessageId().serialize(),
-                message3.getMessageId().serialize()))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1));
-    }
-
-    @Test
-    public void setMessagesShouldReturnUpdatedIdAndNoErrorWhenIsUnreadPassedToFalse() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-
-        // When
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : false } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        // Then
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-    }
-
-    @Test
-    public void massiveFlagUpdateShouldBeApplied() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flag.SEEN));
-        ComposedMessageId message4 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message5 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flag.ANSWERED));
-        ComposedMessageId message6 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId1 = message1.getMessageId().serialize();
-        String serializedMessageId2 = message2.getMessageId().serialize();
-        String serializedMessageId3 = message3.getMessageId().serialize();
-        String serializedMessageId4 = message4.getMessageId().serialize();
-        String serializedMessageId5 = message5.getMessageId().serialize();
-        String serializedMessageId6 = message6.getMessageId().serialize();
-
-        // When
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {" +
-                "  \"%s\" : { \"isUnread\" : false }, " +
-                "  \"%s\" : { \"isUnread\" : false }, " +
-                "  \"%s\" : { \"isUnread\" : false }, " +
-                "  \"%s\" : { \"isUnread\" : false }, " +
-                "  \"%s\" : { \"isUnread\" : false }, " +
-                "  \"%s\" : { \"isUnread\" : false } " +
-                "} }, \"#0\"]]", serializedMessageId1, serializedMessageId2, serializedMessageId3,
-                serializedMessageId4, serializedMessageId5, serializedMessageId6))
-        .when()
-            .post("/jmap")
-        // Then
-        .then()
-            .log().ifValidationFails().body(ARGUMENTS + ".updated", hasSize(6));
-
-        Flags flags1 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-        Flags flags2 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-        Flags flags3 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-        Flags flags4 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-        Flags flags5 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-        Flags flags6 = messageProbe.getMessages(message1.getMessageId(), USERNAME).iterator().next().getFlags();
-
-        SoftAssertions.assertSoftly(softly -> {
-            softly.assertThat(flags1).isEqualTo(new Flags(Flag.SEEN));
-            softly.assertThat(flags2).isEqualTo(new Flags(Flag.SEEN));
-            softly.assertThat(flags3).isEqualTo(new Flags(Flag.SEEN));
-            softly.assertThat(flags4).isEqualTo(new Flags(Flag.SEEN));
-            softly.assertThat(flags5).isEqualTo(new Flags(Flag.SEEN));
-            softly.assertThat(flags6).isEqualTo(new Flags(Flag.SEEN));
-        });
-    }
-
-    @Test
-    public void setMessagesWithUpdateShouldReturnAnErrorWhenBothIsFlagAndKeywordsArePassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : false, \"keywords\": {\"$Seen\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NOT_UPDATED, hasKey(messageId))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].description", containsString("Does not support keyword and is* at the same time"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldUpdateKeywordsWhenKeywordsArePassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Seen\": true, \"$Flagged\": true} } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].keywords.$Seen", equalTo(true))
-            .body(ARGUMENTS + ".list[0].keywords.$Flagged", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldAddForwardedFlagWhenKeywordsWithForwardedIsPassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Seen\": true, \"$Forwarded\": true} } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].keywords.$Seen", equalTo(true))
-            .body(ARGUMENTS + ".list[0].keywords.$Forwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldRemoveForwardedFlagWhenKeywordsWithoutForwardedIsPassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        Flags flags = FlagsBuilder.builder()
-                .add(Flag.SEEN)
-                .add(FORWARDED)
-                .build();
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags);
-
-        String serializedMessageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Seen\": true} } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].keywords.$Seen", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAnErrorWhenKeywordsWithDeletedArePassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Answered\": true, \"$Deleted\" : true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NOT_UPDATED, hasKey(messageId))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].description", containsString("Does not allow to update 'Deleted' or 'Recent' flag"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAnErrorWhenKeywordsWithRecentArePassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Answered\": true, \"$Recent\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NOT_UPDATED, hasKey(messageId))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].description", containsString("Does not allow to update 'Deleted' or 'Recent' flag"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldNotChangeOriginDeletedFlag() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.DELETED));
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Answered\": true, \"$Forwarded\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageId));
-
-        List<MessageResult> messages = messageProbe.getMessages(message.getMessageId(), USERNAME);
-        Flags expectedFlags = FlagsBuilder.builder()
-            .add(Flag.ANSWERED, Flag.DELETED)
-            .add(FORWARDED)
-            .build();
-
-        assertThat(messages)
-            .hasSize(1)
-            .extracting(MessageResult::getFlags)
-            .containsOnly(expectedFlags);
-    }
-
-    @Test
-    public void setMessagesShouldNotChangeOriginRecentFlag() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        Flags flags = FlagsBuilder.builder()
-            .add(Flag.DELETED, Flag.RECENT)
-            .build();
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags);
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Answered\": true, \"$Forwarded\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageId));
-
-        List<MessageResult> messages = messageProbe.getMessages(message.getMessageId(), USERNAME);
-
-        Flags expectedFlags = FlagsBuilder.builder()
-            .add(Flag.ANSWERED, Flag.DELETED, Flag.RECENT)
-            .add(FORWARDED)
-            .build();
-
-        assertThat(messages)
-            .hasSize(1)
-            .extracting(MessageResult::getFlags)
-            .containsOnly(expectedFlags);
-    }
-
-    @Test
-    public void setMessagesShouldReturnNewKeywordsWhenKeywordsArePassedToRemoveAndAddFlag() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        Flags currentFlags = FlagsBuilder.builder()
-                .add(Flag.DRAFT, Flag.ANSWERED)
-                .build();
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, currentFlags);
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Answered\": true, \"$Flagged\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageId));
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].keywords.$Answered", equalTo(true))
-            .body(ARGUMENTS + ".list[0].keywords.$Flagged", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsReadWhenIsUnreadPassedToFalse() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : false } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap");
-        // Then
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(false));
-    }
-
-    @Test
-    public void setMessagesShouldReturnUpdatedIdAndNoErrorWhenIsUnreadPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap")
-        // Then
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsUnreadWhenIsUnreadPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap");
-        // Then
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(true));
-    }
-
-
-    @Test
-    public void setMessagesShouldReturnUpdatedIdAndNoErrorWhenIsFlaggedPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isFlagged\" : true } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap")
-        // Then
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsFlaggedWhenIsFlaggedPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isFlagged\" : true } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap");
-        // Then
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isFlagged", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldRejectUpdateWhenPropertyHasWrongType() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String messageId = randomMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : \"123\" } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NOT_UPDATED, hasKey(messageId))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].properties[0]", equalTo("isUnread"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].description", containsString("isUnread: Cannot deserialize value of type `java.lang.Boolean` from String \"123\": only \"true\" or \"false\" recognized"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].description", containsString("(through reference chain: org.apache.james.jmap.draft.model.UpdateMessagePatch$Builder[\"isUnread\"])"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    @Ignore("Jackson json deserializer stops after first error found")
-    public void setMessagesShouldRejectUpdateWhenPropertiesHaveWrongTypes() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String messageId = USERNAME.asString() + "|mailbox|1";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : \"123\", \"isFlagged\" : 456 } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NOT_UPDATED, hasKey(messageId))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].properties", hasSize(2))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].properties[0]", equalTo("isUnread"))
-            .body(NOT_UPDATED + "[\"" + messageId + "\"].properties[1]", equalTo("isFlagged"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldMarkMessageAsAnsweredWhenIsAnsweredPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        // When
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isAnswered\" : true } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        // Then
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsAnsweredWhenIsAnsweredPassed() throws MailboxException {
-        // Given
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isAnswered\" : true } } }, \"#0\"]]", serializedMessageId))
-        // When
-        .when()
-            .post("/jmap");
-        // Then
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isAnswered", equalTo(true));
-    }
-
-
-    @Test
-    public void setMessagesShouldMarkMessageAsForwardWhenIsForwardedPassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isForwarded\" : true } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(serializedMessageId));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsForwardedWhenIsForwardedPassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId = message.getMessageId().serialize();
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isForwarded\" : true } } }, \"#0\"]]", serializedMessageId))
-        .when()
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + serializedMessageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldReturnNotFoundWhenUpdateUnknownMessage() {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        String nonExistingMessageId = randomMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"isUnread\" : true } } }, \"#0\"]]", nonExistingMessageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NOT_UPDATED, hasKey(nonExistingMessageId))
-            .body(NOT_UPDATED + "[\"" + nonExistingMessageId + "\"].type", equalTo("notFound"))
-            .body(NOT_UPDATED + "[\"" + nonExistingMessageId + "\"].description", equalTo("message not found"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldReturnCreatedMessageWhenSendingMessage() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            // note that assertions on result message had to be split between
-            // string-typed values and boolean-typed value assertions on the same .created entry
-            // make sure only one creation has been processed
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            // assert server-set attributes are returned
-            .body(ARGUMENTS + ".created", hasEntry(equalTo(messageCreationId), Matchers.allOf(
-                hasEntry(equalTo("id"), not(is(nullValue()))),
-                hasEntry(equalTo("blobId"), not(is(nullValue()))),
-                hasEntry(equalTo("threadId"), not(is(nullValue()))),
-                hasEntry(equalTo("size"), not(is(nullValue())))
-            )))
-            // assert that message FLAGS are all unset
-            .body(ARGUMENTS + ".created", hasEntry(equalTo(messageCreationId), Matchers.allOf(
-                hasEntry(equalTo("isDraft"), equalTo(false)),
-                hasEntry(equalTo("isUnread"), equalTo(true)),
-                hasEntry(equalTo("isFlagged"), equalTo(false)),
-                hasEntry(equalTo("isAnswered"), equalTo(false))
-            )))
-            ;
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldNotCreateOverSizedMessages() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String longText = "0123456789\\r\\n".repeat(1024 * 1024);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"" + longText + "\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap").prettyPeek()
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".type", equalTo("invalidArguments"))
-            // Message size is date-time and matchine (Message-Id) dependant
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description",
-                startsWith("Attempt to create a message of "))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description",
-                endsWith("bytes while the maximum allowed is 10485760"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void sendingAMailShouldLeadToAppropriateMailboxCountersOnOutbox() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, getSentId(accessToken)));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {" +
-                "  \"ids\": [\"" + getOutboxId(accessToken) + "\"], " +
-                "  \"properties\" : [\"unreadMessages\", \"totalMessages\"]}, " +
-                "\"#0\"]]")
-            .log().ifValidationFails()
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".totalMessages", equalTo(0))
-            .body(FIRST_MAILBOX + ".unreadMessages", equalTo(0));
-    }
-
-    @Test
-    public void massiveMessageMoveShouldBeApplied() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.DRAFTS);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.OUTBOX);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.SENT);
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.TRASH);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.SPAM);
-
-        ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message2 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId message4 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message5 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-        ComposedMessageId message6 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message7 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message8 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message9 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
-        ComposedMessageId message10 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-        ComposedMessageId message11 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
-        ComposedMessageId message12 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String serializedMessageId1 = message1.getMessageId().serialize();
-        String serializedMessageId2 = message2.getMessageId().serialize();
-        String serializedMessageId3 = message3.getMessageId().serialize();
-        String serializedMessageId4 = message4.getMessageId().serialize();
-        String serializedMessageId5 = message5.getMessageId().serialize();
-        String serializedMessageId6 = message6.getMessageId().serialize();
-        String serializedMessageId7 = message7.getMessageId().serialize();
-        String serializedMessageId8 = message8.getMessageId().serialize();
-        String serializedMessageId9 = message9.getMessageId().serialize();
-        String serializedMessageId10 = message10.getMessageId().serialize();
-        String serializedMessageId11 = message11.getMessageId().serialize();
-        String serializedMessageId12 = message12.getMessageId().serialize();
-
-        // When
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {" +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]}, " +
-                    "  \"%s\" : { \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]} " +
-                    "} }, \"#0\"]]", serializedMessageId1, serializedMessageId2, serializedMessageId3,
-                serializedMessageId4, serializedMessageId5, serializedMessageId6,
-                serializedMessageId7, serializedMessageId8, serializedMessageId9,
-                serializedMessageId10, serializedMessageId11, serializedMessageId12))
-            .when()
-            .post("/jmap")
-            // Then
-            .then()
-            .log().ifValidationFails().body(ARGUMENTS + ".updated", hasSize(12));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void sendingAMailShouldLeadToAppropriateMailboxCountersOnSent() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        calmlyAwait.until(
-            () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, getSentId(accessToken)));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMailboxes\", {" +
-                "  \"ids\": [\"" + getSentId(accessToken) + "\"], " +
-                "  \"properties\" : [\"unreadMessages\", \"totalMessages\"]}, " +
-                "\"#0\"]]")
-            .log().ifValidationFails()
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("mailboxes"))
-            .body(FIRST_MAILBOX + ".totalMessages", equalTo(1))
-            .body(FIRST_MAILBOX + ".unreadMessages", equalTo(0));
-    }
-
-    @Test
-    public void setMessagesShouldReturnCreatedMessageWithEmptySubjectWhenSubjectIsNull() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": null," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].subject", equalTo(""));
-    }
-
-    @Test
-    public void setMessagesShouldReturnCreatedMessageWithEmptySubjectWhenSubjectIsEmpty() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-       .when()
-            .post("/jmap")
-       .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].subject", equalTo(""));
-    }
-
-    @Test
-    public void setMessagesShouldReturnValidErrorWhenMailboxNotFound() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".type", equalTo("anErrorOccurred"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description", endsWith("can not be found"));
-    }
-
-    @Test
-    public void setMessagesShouldReturnCreatedMessageWithNonASCIICharactersInSubjectWhenPresent() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"تصور واضح للعلاقة بين النموذج الرياضي المثالي ومنظومة الظواهر\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-       .when()
-            .post("/jmap")
-       .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].subject", equalTo("تصور واضح للعلاقة بين النموذج الرياضي المثالي ومنظومة الظواهر"));
-    }
-
-    @Test
-    public void setMessagesShouldReturnErrorWhenUserIsNotTheOwnerOfOneOfTheMailboxes() throws Exception {
-        dataProbe.addUser(ALICE.asString(), ALICE_PASSWORD);
-        MailboxId aliceOutbox = mailboxProbe.createMailbox("#private", ALICE.asString(), DefaultMailboxes.OUTBOX);
-
-        aclProbe.replaceRights(MailboxPath.forUser(ALICE, DefaultMailboxes.OUTBOX), USERNAME.asString(), MailboxACL.FULL_RIGHTS);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"\"," +
-            "        \"mailboxIds\": [\"" + aliceOutbox.serialize() + "\", \"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-       .when()
-            .post("/jmap")
-       .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("anErrorOccurred"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("mailboxIds"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("MailboxId invalid"));
-    }
-
-    @Test
-    public void setMessageWithCreatedMessageShouldReturnAnErrorWhenBothIsFlagAndKeywordsPresent() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-                "        \"subject\": \"subject\"," +
-                "        \"isDraft\": true," +
-                "        \"keywords\": {\"$Answered\": true}," +
-                "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("Does not support keyword and is* at the same time"));
-    }
-
-    @Test
-    public void setMessageWithCreatedMessageShouldSupportKeywordsForFlags() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-                "        \"subject\": \"subject\"," +
-                "        \"keywords\": {\"$Answered\": true, \"$Flagged\": true}," +
-                "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].keywords.$Answered", equalTo(true))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].keywords.$Flagged", equalTo(true));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldAllowDraftCreation() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldNotAllowDraftCreationWhenOverQuota() throws MailboxException {
-        QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-        QuotaRoot inboxQuotaRoot = quotaProbe.getQuotaRoot(MailboxPath.inbox(USERNAME));
-        quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100));
-
-        MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("maxQuotaReached"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesWithABigBodyShouldReturnCreatedMessageWhenSendingMessage() {
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(LogDetail.HEADERS);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String body = Strings.repeat("d", BIG_MESSAGE_SIZE);
-        {
-            String requestBody = new StringBuilder(BIG_MESSAGE_SIZE + 10 * 1024)
-                .append("[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-                "        \"subject\": \"Thank you for joining example.com!\"," +
-                "        \"textBody\": \"")
-                .append(body)
-                .append("\"," +
-                "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]")
-                .toString();
-
-            given()
-                .header("Authorization", accessToken.asString())
-                .body(requestBody)
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messagesSet"))
-                .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-                .body(ARGUMENTS + ".created", aMapWithSize(1))
-                .body(ARGUMENTS + ".created", hasEntry(equalTo(messageCreationId), hasEntry(equalTo("textBody"), equalTo(body))));
-        }
-
-        calmlyAwait
-            .pollDelay(Duration.ofMillis(500))
-            .atMost(30, TimeUnit.SECONDS).until(() -> hasANewMailWithBody(accessToken, body));
-    }
-
-    private boolean hasANewMailWithBody(AccessToken recipientToken, String body) {
-        try {
-            String inboxId = getMailboxId(accessToken, Role.INBOX);
-            String receivedMessageId =
-                with()
-                    .header("Authorization", accessToken.asString())
-                    .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-                    .post("/jmap")
-                .then()
-                    .extract()
-                    .path(ARGUMENTS + ".messageIds[0]");
-
-            given()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messages"))
-                .body(ARGUMENTS + ".list", hasSize(1))
-                .body(ARGUMENTS + ".list[0].textBody", equalTo(body));
-            return true;
-
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldNotAllowCopyWhenOverQuota() throws MailboxException {
-        QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-        QuotaRoot inboxQuotaRoot = quotaProbe.getQuotaRoot(MailboxPath.inbox(USERNAME));
-        quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100));
-
-        List<ComposedMessageId> composedMessageIds = MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX);
-
-        String messageId = composedMessageIds.get(0).getMessageId().serialize();
-        String requestBody =  "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId + "\" : {" +
-            "        \"mailboxIds\": [\"" + getInboxId(accessToken) + "\",\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".updated", hasSize(0))
-            .body(ARGUMENTS + ".notUpdated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notUpdated." + messageId + ".type", equalTo("maxQuotaReached"));
-    }
-
-    @Test
-    public void setMessagesShouldCreateDraftInSeveralMailboxes() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String draftId = getDraftId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + mailboxId.serialize() + "\", \"" + draftId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].mailboxIds", containsInAnyOrder(mailboxId.serialize(), draftId));
-    }
-
-    @Test
-    public void setMessagesShouldAllowDraftCreationOutsideOfDraftMailbox() {
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldRejectMessageCreationWithNoMailbox() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": []" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description", equalTo("Message needs to be in at least one mailbox"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".properties", contains("mailboxIds"));
-    }
-
-    @Test
-    public void setMessagesShouldNotFailWhenSavingADraftInSeveralMailboxes() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\", \"" + mailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldAllowDraftCreationWhenUsingIsDraftProperty() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isDraft\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldMarkAsDraftWhenIsDraftPassed() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isDraft\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isDraft", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldRejectCreateInDraftAndOutboxForASingleMessage() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\", \"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description", equalTo("Message creation is only supported in mailboxes with role Draft and Outbox"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".properties", contains("mailboxIds"));
-    }
-
-    @Test
-    public void setMessagesShouldStoreDraft() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(requestBody)
-                .post("/jmap")
-                .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + messageCreationId + "\"].id");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".id", equalTo(receivedMessageId));
-    }
-
-    @Test
-    public void setMessagesShouldNotCheckFromWhenDraft() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"invalid@domain.com\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldNotCheckFromWhenInvalidEmailWhenDraft() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"invalid\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .when()
-            .post("/jmap")
-            .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldAllowDraftCreationWithoutFrom() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldAllowDraftCreationWithoutRecipients() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"invalid@domain.com\"}," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldRequireDraftFlagWhenSavingDraft() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Flagged\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("keywords"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", equalTo("A draft message should be flagged as Draft"));
-    }
-
-    @Test
-    public void setMessagesShouldCheckAttachmentsWhenDraft() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"attachments\": [" +
-            "                {\"blobId\" : \"wrong\", \"type\" : \"image/jpeg\", \"size\" : 1337}" +
-            "             ]," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("attachments"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", equalTo("Attachment not found"));
-    }
-
-    @Test
-    public void setMessagesShouldAcceptAttachmentsWhenDraft() throws Exception {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String bytes = "attachment";
-        AttachmentMetadata uploadedAttachment = uploadAttachment(OCTET_CONTENT_TYPE, bytes.getBytes(StandardCharsets.UTF_8));
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"attachments\": [" +
-            "                {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "                 \"type\" : \"" + uploadedAttachment.getType().asString() + "\"," +
-            "                 \"size\" : " + uploadedAttachment.getSize() + "}" +
-            "             ]," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .when()
-            .post("/jmap")
-            .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId));
-    }
-
-    @Test
-    public void setMessagesShouldNotAllowDraftCreationInSomeoneElseMailbox() throws Exception {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("anErrorOccurred"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("can not be found"));
-    }
-
-    @Test
-    public void setMessagesShouldNotAllowDraftCreationInADelegatedMailbox() throws Exception {
-        String messageCreationId = "creationId1337";
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.DRAFTS);
-        aclProbe.addRights(
-                MailboxPath.forUser(USERNAME, DefaultMailboxes.DRAFTS),
-                BOB.asString(),
-                MailboxACL.FULL_RIGHTS);
-
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("anErrorOccurred"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("mailboxIds"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("MailboxId invalid"));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldSendMessageByMovingDraftToOutbox() {
-        String draftCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String createDraft = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + draftCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String draftId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(createDraft)
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + draftCreationId + "\"].id");
-
-        String moveDraftToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + draftId + "\" : {" +
-            "        \"keywords\": {}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(moveDraftToOutBox)
-            .post("/jmap");
-
-        calmlyAwait
-            .pollDelay(Duration.ofMillis(500))
-            .atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
-    }
-
-    @Test
-    public void setMessagesShouldSendMessageByMovingDraftToOutboxForAMailSentFromAnAlias() throws Exception {
-        dataProbe.addUserAliasMapping(Username.of(ALIAS_OF_USERNAME_MAIL).getLocalPart(), ALIAS_OF_USERNAME.getDomainPart().get().asString(), USERNAME.asString());
-
-        String draftCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String createDraft = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + draftCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + ALIAS_OF_USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String draftId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(createDraft)
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + draftCreationId + "\"].id");
-
-        String moveDraftToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + draftId + "\" : {" +
-            "        \"keywords\": {}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(moveDraftToOutBox)
-            .post("/jmap");
-
-        calmlyAwait
-            .pollDelay(Duration.ofMillis(500))
-            .atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
-    }
-
-    @Test
-    public void setMessagesShouldRejectDraftCopyToOutbox() {
-        String draftCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String createDraft = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + draftCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String draftId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(createDraft)
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + draftCreationId + "\"].id");
-
-        String copyDraftToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + draftId + "\" : {" +
-            "        \"keywords\": {\"$Draft\":true}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\",\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(copyDraftToOutBox)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasKey(draftId))
-            .body(ARGUMENTS + ".notUpdated[\"" + draftId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notUpdated[\"" + draftId + "\"].description", endsWith("When moving a message to Outbox, only Outboxes mailboxes should be targeted."))
-            .body(ARGUMENTS + ".notUpdated[\"" + draftId + "\"].properties", hasSize(1))
-            .body(ARGUMENTS + ".notUpdated[\"" + draftId + "\"].properties", contains("mailboxIds"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldRejectMovingMessageToOutboxWhenNotInDraft() throws MailboxException {
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String messageId = message.getMessageId().serialize();
-        String moveMessageToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId + "\" : {" +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(moveMessageToOutBox)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notUpdated", hasKey(messageId))
-            .body(ARGUMENTS + ".notUpdated[\"" + messageId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notUpdated[\"" + messageId + "\"].description", endsWith("Only message with `$Draft` keyword can be moved to Outbox"))
-            .body(ARGUMENTS + ".notUpdated[\"" + messageId + "\"].properties", hasSize(1))
-            .body(ARGUMENTS + ".notUpdated[\"" + messageId + "\"].properties", contains("mailboxIds"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldSupportArbitraryMessageId() {
-        String messageCreationId = "1717fcd1-603e-44a5-b2a6-1234dbcd5723";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-    }
-
-    @Test
-    public void setMessagesShouldCreateMessageInOutboxWhenSendingMessage() throws MailboxException {
-        // Given
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String messageSubject = "Thank you for joining example.com!";
-        String outboxId = getOutboxId(accessToken);
-
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"" + messageSubject + "\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        EventCollector eventCollector = new EventCollector();
-        jmapServer.getProbe(JmapGuiceProbe.class).addEventListener(eventCollector);
-
-        String messageId = with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-
-
-        calmlyAwait.atMost(5, TimeUnit.SECONDS).until(() -> eventCollector.getEvents().stream()
-            .anyMatch(event -> isAddedToOutboxEvent(messageId, event, outboxId)));
-    }
-
-    private boolean isAddedToOutboxEvent(String messageId, Event event, String outboxId) {
-        if (!(event instanceof Added)) {
-            return false;
-        }
-        Added added = (Added) event;
-        return added.getMailboxId().serialize().equals(outboxId)
-            && added.getUids().size() == 1
-            && added.getMetaData(added.getUids().iterator().next()).getMessageId().serialize().equals(messageId);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldMoveMessageInSentWhenMessageIsSent() {
-        // Given
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        String fromAddress = USERNAME.asString();
-        String messageCreationId = "creationId1337";
-        String messageSubject = "Thank you for joining example.com!";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"" + messageSubject + "\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> messageHasBeenMovedToSentBox(sentMailboxId));
-    }
-
-    private boolean messageHasBeenMovedToSentBox(String sentMailboxId) {
-        try {
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"fetchMessages\":true, \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(SECOND_NAME, equalTo("messages"))
-                .body(SECOND_ARGUMENTS + ".list", hasSize(1));
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Test
-    public void setMessagesShouldRejectWhenSendingMessageHasNoValidAddress() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("no recipient address set"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldRejectWhenSendingMessageHasMissingFrom() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("'from' address is mandatory"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", hasSize(1))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("from"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldReturnNotCreatedWhenSendingMessageWithAnotherFromAddressThanTheConnectedUser() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"wrongaddress@otherdomain.org\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated." + messageCreationId + ".description", equalTo("Invalid 'from' field. One accepted value is " + USERNAME.asString()));
-    }
-
-    @Test
-    public void setMessagesShouldSucceedWhenSendingMessageFromAnAliasOfTheConnectedUser() throws Exception {
-        dataProbe.addUserAliasMapping(Username.of(ALIAS_OF_USERNAME_MAIL).getLocalPart(), ALIAS_OF_USERNAME.getDomainPart().get().asString(), USERNAME.asString());
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + ALIAS_OF_USERNAME_MAIL + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].headers.From", equalTo(ALIAS_OF_USERNAME_MAIL))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.name", equalTo(ALIAS_OF_USERNAME_MAIL))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.email", equalTo(ALIAS_OF_USERNAME_MAIL));
-
-        calmlyAwait
-            .pollDelay(Duration.ofMillis(500))
-            .atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
-
-    }
-
-    @Test
-    public void setMessagesShouldSucceedWhenSendingMessageFromADomainAliasOfTheConnectedUser() throws Exception {
-        dataProbe.addDomain(DOMAIN_ALIAS);
-        dataProbe.addDomainAliasMapping(DOMAIN_ALIAS, DOMAIN);
-
-        String messageCreationId = "creationId1337";
-        String alias = USERNAME.withOtherDomain(Domain.of(DOMAIN_ALIAS)).asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId + "\" : {" +
-            "        \"from\": { \"email\": \"" + alias + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].headers.From", equalTo(alias))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.name", equalTo(alias))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.email", equalTo(alias));
-
-        calmlyAwait
-            .pollDelay(Duration.ofMillis(500))
-            .atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
-    }
-
-    @Test
-    public void setMessagesShouldFailWhenSendingMessageFromAGroupAliasOfTheConnectedUser() throws Exception {
-        dataProbe.addGroupAliasMapping(GROUP_MAIL, USERNAME.asString());
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + GROUP_MAIL + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(ARGUMENTS + ".created", anEmptyMap())
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId));
-
-        String outboxId = getMailboxId(accessToken, Role.OUTBOX);
-        assertThat(hasNoMessageIn(bobAccessToken, outboxId)).isTrue();
-    }
-
-    @Test
-    public void setMessagesShouldNotCreateMessageInOutboxWhenSendingMessageWithAnotherFromAddressThanTheConnectedUser() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"wrongaddress@otherdomain.org\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200);
-
-        String outboxId = getMailboxId(accessToken, Role.OUTBOX);
-        assertThat(hasNoMessageIn(bobAccessToken, outboxId)).isTrue();
-    }
-
-    private boolean hasNoMessageIn(AccessToken accessToken, String mailboxId) {
-        try {
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messageList"))
-                .body(ARGUMENTS + ".messageIds", empty());
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Test
-    public void setMessagesShouldSucceedWhenSendingMessageWithOnlyFromAddress() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].headers.From", equalTo(fromAddress))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.name", equalTo(fromAddress))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.email", equalTo(fromAddress));
-    }
-
-    @Test
-    public void setMessagesShouldSucceedWithHtmlBody() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"htmlBody\": \"Hello <i>someone</i>, and thank <b>you</b> for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].headers.From", equalTo(fromAddress))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.name", equalTo(fromAddress))
-            .body(ARGUMENTS + ".created[\"" + messageCreationId + "\"].from.email", equalTo(fromAddress));
-    }
-
-    @Test
-    public void setMessagesShouldMoveToSentWhenSendingMessageWithOnlyFromAddress() {
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> messageHasBeenMovedToSentBox(sentMailboxId));
-    }
-
-    @Test
-    public void setMessagesShouldNotRejectWhenSendingMessageHasMissingSubject() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-}
-
-    @Test
-    public void setMessagesShouldRejectWhenSendingMessageUseSomeoneElseFromAddress() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"other@domain.tld\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("invalidProperties"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", hasSize(1))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].properties", contains("from"))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].description", endsWith("Invalid 'from' field. One accepted value is username@domain.tld"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldDeliverMessageToRecipient() throws Exception {
-        // Sender
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(recipientToken));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldTriggerMaxQuotaReachedWhenTryingToSendMessageAndQuotaReached() throws Exception {
-        QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
-        QuotaRoot inboxQuotaRoot = quotaProbe.getQuotaRoot(MailboxPath.inbox(USERNAME));
-        quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100));
-
-        MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX);
-
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(1))
-            .body(ARGUMENTS + ".created", aMapWithSize(0))
-            .body(ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"].type", equalTo("maxQuotaReached"));
-    }
-
-    @Test
-    public void setMessagesShouldStripBccFromDeliveredEmail() throws Exception {
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String bccRecipient = BOB.asString();
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"recipient\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"bcc\": [{ \"name\": \"BOB\", \"email\": \"" + bccRecipient + "\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(recipientToken));
-        with()
-            .header("Authorization", recipientToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"bcc\"] }, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].bcc", empty());
-    }
-
-    @Test
-    public void setMessagesShouldKeepBccInSentMailbox() throws Exception {
-        // Sender
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"recipient\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"bcc\": [{ \"name\": \"BOB\", \"email\": \"bob@" + DOMAIN + "\" }]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> messageHasBeenMovedToSentBox(sentMailboxId));
-        with()
-            .header("Authorization", this.accessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\":true, \"fetchMessageProperties\": [\"bcc\"], \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].bcc", hasSize(1));
-    }
-
-    @Test
-    public void setMessagesShouldSendMessageToBcc() throws Exception {
-        // Sender
-
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-
-        String bccAddress = BOB.asString();
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bccAddress, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"recipient\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"bcc\": [{ \"name\": \"BOB\", \"email\": \"" + bccAddress + "\" }]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"bcc\"] }, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].bcc", empty());
-    }
-
-    private boolean isAnyMessageFoundInRecipientsMailboxes(AccessToken recipientToken) {
-        try {
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", {}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messageList"))
-                .body(ARGUMENTS + ".messageIds", hasSize(1));
-            return true;
-
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-
-    @Test
-    public void setMessagesShouldSendAReadableHtmlMessage() throws Exception {
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"htmlBody\": \"Hello <b>someone</b>, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isHtmlMessageReceived(recipientToken));
-    }
-
-
-    @Test
-    public void setMessagesWhenSavingToDraftsShouldNotSendMessage() throws Exception {
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String recipientPassword = "password";
-        dataProbe.addUser(recipientAddress, recipientPassword);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), recipientPassword);
-
-        String senderDraftsMailboxId = getMailboxId(accessToken, Role.DRAFTS);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + senderDraftsMailboxId + "\"], " +
-            "        \"isDraft\": false" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200);
-
-        //We need to wait for an async event to not happen, we couldn't found any
-        //robust way to check that.
-        Thread.sleep(TimeUnit.SECONDS.toMillis(5));
-        assertThat(isAnyMessageFoundInRecipientsMailboxes(recipientToken)).isFalse();
-    }
-
-    @Test
-    public void setMessagesWhenSavingToRegularMailboxShouldNotSendMessage() throws Exception {
-        String sender = USERNAME.asString();
-        MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, sender, "regular");
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String recipientPassword = "password";
-        dataProbe.addUser(recipientAddress, recipientPassword);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"cc\": [{ \"name\": \"ALICE\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String notCreatedMessage = ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"]";
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(notCreatedMessage + ".type", equalTo("invalidProperties"))
-            .body(notCreatedMessage + ".description", equalTo("Message creation is only supported in mailboxes with role Draft and Outbox"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-
-    private boolean isHtmlMessageReceived(AccessToken recipientToken) {
-        try {
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"htmlBody\"]}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(SECOND_NAME, equalTo("messages"))
-                .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-                .body(SECOND_ARGUMENTS + ".list[0].htmlBody", equalTo("Hello <b>someone</b>, and thank you for joining example.com!"))
-            ;
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Test
-    public void setMessagesShouldSendAReadableTextPlusHtmlMessage() throws Exception {
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-        AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"htmlBody\": \"Hello <b>someone</b>, and thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com, text version!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isTextPlusHtmlMessageReceived(recipientToken));
-    }
-
-    private boolean isTextPlusHtmlMessageReceived(AccessToken recipientToken) {
-        try {
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", {\"fetchMessages\": true, \"fetchMessageProperties\": [\"htmlBody\", \"textBody\"]}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(SECOND_NAME, equalTo("messages"))
-                .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-                .body(SECOND_ARGUMENTS + ".list[0].htmlBody", equalTo("Hello <b>someone</b>, and thank you for joining example.com!"))
-                .body(SECOND_ARGUMENTS + ".list[0].textBody", equalTo("Hello someone, and thank you for joining example.com, text version!"))
-            ;
-            return true;
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Test
-    public void mailboxIdsShouldReturnUpdatedWhenNoChange() throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String mailboxId = message.getMailboxId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + mailboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageToMoveId));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mailboxIdsShouldBeInDestinationWhenUsingForMove() throws Exception {
-        String newMailboxName = "heartFolder";
-        String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + heartFolderId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", contains(heartFolderId));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mailboxIdsShouldNotBeAnymoreInSourceWhenUsingForMove() throws Exception {
-        String newMailboxName = "heartFolder";
-        String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String inboxId = message.getMailboxId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + heartFolderId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", not(contains(inboxId)));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void mailboxIdsShouldBeInBothMailboxWhenUsingForCopy() throws Exception {
-        String newMailboxName = "heartFolder";
-        String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String inboxId = message.getMailboxId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + heartFolderId + "\",\"" + inboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", containsInAnyOrder(heartFolderId, inboxId));
-    }
-
-    @Test
-    public void mailboxIdsShouldBeInOriginalMailboxWhenNoChange() throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String mailboxId = message.getMailboxId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + mailboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", contains(mailboxId));
-    }
-
-    @Test
-    public void mailboxIdsShouldReturnErrorWhenMovingToADeletedMailbox() throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "any");
-        String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "any")
-            .serialize();
-        mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "any");
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + mailboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NOT_UPDATED, hasKey(messageToMoveId))
-            .body(NOT_UPDATED + "[\"" + messageToMoveId + "\"].type", equalTo("anErrorOccurred"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    public void mailboxIdsShouldReturnErrorWhenSetToEmpty() throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": []" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(NOT_UPDATED, hasKey(messageToMoveId))
-            .body(NOT_UPDATED + "[\"" + messageToMoveId + "\"].type", equalTo("invalidProperties"))
-            .body(NOT_UPDATED + "[\"" + messageToMoveId + "\"].properties", hasSize(1))
-            .body(NOT_UPDATED + "[\"" + messageToMoveId + "\"].properties[0]", equalTo("mailboxIds"))
-            .body(ARGUMENTS + ".updated", hasSize(0));
-    }
-
-    @Test
-    public void updateShouldNotReturnErrorWithFlagsAndMailboxUpdate() throws Exception {
-        String newMailboxName = "heartFolder";
-        String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + heartFolderId + "\"]," +
-            "        \"isUnread\": true" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageToMoveId));
-    }
-
-    @Test
-    public void updateShouldWorkWithFlagsAndMailboxUpdate() throws Exception {
-        String newMailboxName = "heartFolder";
-        String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + heartFolderId + "\"]," +
-            "        \"isUnread\": true" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", contains(heartFolderId))
-            .body(firstMessage + ".isUnread", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldWorkForMoveToTrash() throws Exception {
-        String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.TRASH).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + trashId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo(messageToMoveId))
-            .body(ARGUMENTS + ".updated", hasSize(1));
-    }
-
-    @Test
-    public void copyToTrashShouldWork() throws Exception {
-        String newMailboxName = "heartFolder";
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), newMailboxName);
-        String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), DefaultMailboxes.TRASH).serialize();
-
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME),
-            new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
-
-        String messageToMoveId = message.getMessageId().serialize();
-        String mailboxId = message.getMailboxId().serialize();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageToMoveId + "\" : {" +
-            "        \"mailboxIds\": [\"" + trashId + "\",\"" + mailboxId + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageToMoveId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".mailboxIds", containsInAnyOrder(trashId, mailboxId));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAttachmentsNotFoundWhenBlobIdDoesntExist() {
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Message with a broken blobId\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "                {\"blobId\" : \"brokenId1\", \"type\" : \"image/gif\", \"size\" : 1337}," +
-            "                {\"blobId\" : \"brokenId2\", \"type\" : \"image/jpeg\", \"size\" : 1337}" +
-            "             ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String notCreatedPath = ARGUMENTS + ".notCreated[\"" + messageCreationId + "\"]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", hasKey(messageCreationId))
-            .body(notCreatedPath + ".type", equalTo("invalidProperties"))
-            .body(notCreatedPath + ".properties", contains("attachments"))
-            .body(notCreatedPath + ".attachmentsNotFound", containsInAnyOrder("brokenId1", "brokenId2"))
-            .body(ARGUMENTS + ".created", aMapWithSize(0));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAttachmentsWhenMessageHasAttachment() throws Exception {
-        String bytes1 = "attachment";
-        String bytes2 = "attachment2";
-        AttachmentMetadata uploadedAttachment1 = uploadAttachment(OCTET_CONTENT_TYPE, bytes1.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment2 = uploadAttachment(OCTET_CONTENT_TYPE, bytes2.getBytes(StandardCharsets.UTF_8));
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Message with two attachments\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment1.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment1.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment1.getSize() + "}," +
-            "               {\"blobId\" : \"" + uploadedAttachment2.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment2.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment2.getSize() + ", " +
-            "               \"cid\" : \"123456789\", " +
-            "               \"isInline\" : true }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String createdPath = ARGUMENTS + ".created[\"" + messageCreationId + "\"]";
-
-        String json = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(createdPath + ".attachments", hasSize(2))
-            .extract().asString();
-
-        assertThatJson(json)
-            .withOptions(new Options(Option.TREATING_NULL_AS_ABSENT, Option.IGNORING_ARRAY_ORDER, Option.IGNORING_EXTRA_FIELDS))
-            .whenIgnoringPaths(createdPath + ".attachments[0].blobId", createdPath + ".attachments[1].blobId",
-                createdPath + ".attachments[0].inlinedWithCid", createdPath + ".attachments[1].inlinedWithCid")
-            .inPath(createdPath + ".attachments")
-            .isEqualTo("[{" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes1.length() + "," +
-                "  \"cid\":null," +
-                "  \"isInline\":false" +
-                "}, {" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes2.length() + "," +
-                "  \"cid\":\"123456789\"," +
-                "  \"isInline\":true" +
-                "}]");
-    }
-
-    @Test
-    public void setMessagesShouldPreserveCharsetOfAttachment() throws Exception {
-        String bytes1 = "attachment";
-        String bytes2 = "attachment2";
-        AttachmentMetadata uploadedAttachment1 = uploadAttachment(OCTET_CONTENT_TYPE_UTF8, bytes1.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment2 = uploadAttachment(OCTET_CONTENT_TYPE_UTF8, bytes2.getBytes(StandardCharsets.UTF_8));
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Message with two attachments\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment1.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment1.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment1.getSize() + "}," +
-            "               {\"blobId\" : \"" + uploadedAttachment2.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment2.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment2.getSize() + ", " +
-            "               \"cid\" : \"123456789\", " +
-            "               \"isInline\" : true }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String createdPath = ARGUMENTS + ".created[\"" + messageCreationId + "\"]";
-
-        String json = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(createdPath + ".attachments", hasSize(2))
-            .extract().asString();
-
-        assertThatJson(json)
-            .withOptions(new Options(Option.TREATING_NULL_AS_ABSENT, Option.IGNORING_ARRAY_ORDER, Option.IGNORING_EXTRA_FIELDS))
-            .whenIgnoringPaths(createdPath + ".attachments[0].blobId", createdPath + ".attachments[1].blobId",
-                createdPath + ".attachments[0].inlinedWithCid", createdPath + ".attachments[1].inlinedWithCid")
-            .inPath(createdPath + ".attachments")
-            .isEqualTo("[{" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes1.length() + "," +
-                "  \"cid\":null," +
-                "  \"isInline\":false" +
-                "}, {" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes2.length() + "," +
-                "  \"cid\":\"123456789\"," +
-                "  \"isInline\":true" +
-                "}]");
-    }
-
-    @Test
-    public void setMessagesShouldReturnAttachmentsWithNonASCIINames() throws Exception {
-        String bytes1 = "attachment";
-        String bytes2 = "attachment2";
-        String bytes3 = "attachment3";
-        AttachmentMetadata uploadedAttachment1 = uploadAttachment(OCTET_CONTENT_TYPE, bytes1.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment2 = uploadAttachment(OCTET_CONTENT_TYPE, bytes2.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment3 = uploadAttachment(OCTET_CONTENT_TYPE, bytes3.getBytes(StandardCharsets.UTF_8));
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\":" +
-            "      {" +
-            "        \"" + messageCreationId  + "\" : " +
-            "        {" +
-            "          \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "          \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "          \"subject\": \"Message with three attachments with non ASCII name\"," +
-            "          \"textBody\": \"Test body\"," +
-            "          \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "          \"attachments\":" +
-            "          [" +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment1.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment1.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment1.getSize() + "," +
-            "              \"name\" : \"ديناصور.png\", " +
-            "              \"isInline\" : false" +
-            "            }," +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment2.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment2.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment2.getSize() + "," +
-            "              \"name\" : \"�волюционировать.png\", " +
-            "              \"isInline\" : false" +
-            "            }," +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment3.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment3.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment3.getSize() + "," +
-            "              \"name\" : \"进化还是�.png\"," +
-            "              \"isInline\" : false" +
-            "            }" +
-            "          ]" +
-            "        }" +
-            "      }" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String createdPath = ARGUMENTS + ".created[\"" + messageCreationId + "\"]";
-        String firstAttachment = createdPath + ".attachments[0]";
-        String secondAttachment = createdPath + ".attachments[1]";
-        String thirdAttachment = createdPath + ".attachments[2]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(createdPath + ".attachments", hasSize(3))
-            .body(firstAttachment + ".name", equalTo("ديناصور.png"))
-            .body(secondAttachment + ".name", equalTo("�волюционировать.png"))
-            .body(thirdAttachment + ".name", equalTo("进化还是�.png"));
-    }
-
-    @Test
-    public void filenamesAttachmentsWithNonASCIICharactersShouldBeRetrievedWhenChainingSetMessagesAndGetMessages() throws Exception {
-        String bytes1 = "attachment";
-        String bytes2 = "attachment2";
-        String bytes3 = "attachment3";
-        AttachmentMetadata uploadedAttachment1 = uploadAttachment(OCTET_CONTENT_TYPE, bytes1.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment2 = uploadAttachment(OCTET_CONTENT_TYPE, bytes2.getBytes(StandardCharsets.UTF_8));
-        AttachmentMetadata uploadedAttachment3 = uploadAttachment(OCTET_CONTENT_TYPE, bytes3.getBytes(StandardCharsets.UTF_8));
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\":" +
-            "      {" +
-            "        \"" + messageCreationId  + "\" : " +
-            "        {" +
-            "          \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "          \"to\": [{ \"name\": \"BOB\", \"email\": \"" + fromAddress + "\"}]," +
-            "          \"subject\": \"Message with three attachments with non ASCII name\"," +
-            "          \"textBody\": \"Test body\"," +
-            "          \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "          \"attachments\":" +
-            "          [" +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment1.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment1.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment1.getSize() + "," +
-            "              \"name\" : \"ديناصور.png\", " +
-            "              \"isInline\" : false" +
-            "            }," +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment2.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment2.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment2.getSize() + "," +
-            "              \"name\" : \"�волюционировать.png\", " +
-            "              \"isInline\" : false" +
-            "            }," +
-            "            {" +
-            "              \"blobId\" : \"" + uploadedAttachment3.getAttachmentId().getId() + "\", " +
-            "              \"type\" : \"" + uploadedAttachment3.getType().asString() + "\", " +
-            "              \"size\" : " + uploadedAttachment3.getSize() + "," +
-            "              \"name\" : \"进化还是�.png\"," +
-            "              \"isInline\" : false" +
-            "            }" +
-            "          ]" +
-            "        }" +
-            "      }" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap").then();
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-        String firstAttachment = message + ".attachments[0]";
-        String secondAttachment = message + ".attachments[1]";
-        String thirdAttachment = message + ".attachments[2]";
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".attachments", hasSize(3))
-            .body(firstAttachment + ".name", equalTo("ديناصور.png"))
-            .body(secondAttachment + ".name",  equalTo("�волюционировать.png"))
-            .body(thirdAttachment + ".name", equalTo("进化还是�.png"));
-    }
-
-    private AttachmentMetadata uploadAttachment(String contentType, byte[] content) {
-        JsonPath json = with()
-            .header("Authorization", accessToken.asString())
-            .contentType(contentType)
-            .body(new ByteArrayInputStream(content))
-            .post("/upload")
-        .then()
-            .extract()
-            .body()
-            .jsonPath();
-
-        return AttachmentMetadata.builder()
-            .messageId(new DefaultMessageId())
-            .attachmentId(StringBackedAttachmentId.from(json.getString("blobId")))
-            .size(json.getLong("size"))
-            .type(json.getString("type"))
-            .build();
-    }
-
-    private AttachmentMetadata uploadTextAttachment(String contentType, String content) {
-        JsonPath json = with()
-            .header("Authorization", accessToken.asString())
-            .contentType(contentType)
-            .body(content)
-            .post("/upload")
-        .then()
-            .extract()
-            .body()
-            .jsonPath();
-
-        return AttachmentMetadata.builder()
-            .messageId(new DefaultMessageId())
-            .attachmentId(StringBackedAttachmentId.from(json.getString("blobId")))
-            .size(json.getLong("size"))
-            .type(json.getString("type"))
-            .build();
-    }
-
-    @Test
-    public void attachmentsShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesBinaryAttachment() throws Exception {
-        byte[] rawBytes = new byte[]{-128,-127,-126,-125,-124,-123,-122,-121,-120,-119,-118,-117,-116,-115,-114,-113,-112,-111,-110,-109,-108,-107,-106,-105,-104,-103,-102,-101,-100,
-            -99,-98,-97,-96,-95,-94,-93,-92,-91,-90,-89,-88,-87,-86,-85,-84,-83,-82,-81,-80,-79,-78,-77,-76,-75,-74,-73,-72,-71,-70,-69,-68,-67,-66,-65,-64,-63,-62,-61,-60,-59,-58,-57,-56,-55,-54,-53,-52,-51,
-            -50,-49,-48,-47,-46,-45,-44,-43,-42,-41,-40,-39,-38,-37,-36,-35,-34,-33,-32,-31,-30,-29,-28,-27,-26,-25,-24,-23,-22,-21,-20,-19,-18,-17,-16,-15,-14,-13,-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,
-            0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,
-            50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,
-            100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127};
-
-        AttachmentMetadata uploadedAttachment = uploadAttachment(OCTET_CONTENT_TYPE, rawBytes);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment.getSize() + ", " +
-            "               \"cid\" : \"123456789\", " +
-            "               \"isInline\" : true }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        String firstAttachment = firstMessage + ".attachments[0]";
-        String blobId = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo(OCTET_CONTENT_TYPE_UTF8))
-            .body(firstAttachment + ".size", equalTo(rawBytes.length))
-            .body(firstAttachment + ".cid", equalTo("123456789"))
-            .body(firstAttachment + ".isInline", equalTo(true))
-            .extract()
-            .jsonPath()
-            .getString(firstAttachment + ".blobId");
-
-        checkBlobContent(blobId, rawBytes);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void attachmentsShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesTextAttachment() throws Exception {
-        byte[] rawBytes = ByteStreams.toByteArray(new ZeroedInputStream(_1MB));
-        AttachmentMetadata uploadedAttachment = uploadAttachment(OCTET_CONTENT_TYPE, rawBytes);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment.getSize() + ", " +
-            "               \"cid\" : \"123456789\", " +
-            "               \"isInline\" : true }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        String firstAttachment = firstMessage + ".attachments[0]";
-        String blobId = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo(OCTET_CONTENT_TYPE_UTF8))
-            .body(firstAttachment + ".size", equalTo(rawBytes.length))
-            .body(firstAttachment + ".cid", equalTo("123456789"))
-            .body(firstAttachment + ".isInline", equalTo(true))
-            .extract()
-            .jsonPath()
-            .getString(firstAttachment + ".blobId");
-
-        checkBlobContent(blobId, rawBytes);
-    }
-
-    private boolean isAnyMessageFoundInInbox(AccessToken recipientToken) {
-        try {
-            String inboxId = getMailboxId(recipientToken, Role.INBOX);
-            with()
-                .header("Authorization", recipientToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .when()
-                .post("/jmap")
-            .then()
-                .statusCode(200)
-                .body(NAME, equalTo("messageList"))
-                .body(ARGUMENTS + ".messageIds", hasSize(1));
-            return true;
-
-        } catch (AssertionError e) {
-            return false;
-        }
-    }
-
-    @Test
-    public void attachmentsAndBodysShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesWithMixedTextAndHtmlBodyAndHtmlAttachment() throws Exception {
-        String text = "<html>\n" +
-            "  <body>attachment</body>\n" + // needed indentation, else restassured is adding some
-            "</html>";
-        String contentType = "text/html; charset=UTF-8";
-        AttachmentMetadata uploadedAttachment = uploadTextAttachment(contentType, text);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body, plain text version\"," +
-            "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment.getSize() + ", " +
-            "               \"isInline\" : false }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        String firstAttachment = firstMessage + ".attachments[0]";
-        String blobId = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".textBody", equalTo("Test body, plain text version"))
-            .body(firstMessage + ".htmlBody", equalTo("Test <b>body</b>, HTML version"))
-            .body(firstMessage + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo("text/html; charset=UTF-8"))
-            .body(firstAttachment + ".size", equalTo(text.length()))
-            .extract()
-            .jsonPath()
-            .getString(firstAttachment + ".blobId");
-
-        checkBlobContent(blobId, text.getBytes(StandardCharsets.UTF_8));
-    }
-
-    @Test
-    public void attachmentsAndBodyShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesWithTextBodyAndHtmlAttachment() throws Exception {
-        String text = "<html>\n" +
-            "  <body>attachment</body>\n" + // needed indentation, else restassured is adding some
-            "</html>";
-        String contentType = "text/html; charset=UTF-8";
-        AttachmentMetadata uploadedAttachment = uploadTextAttachment(contentType, text);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"textBody\": \"Test body, plain text version\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment.getSize() + ", " +
-            "               \"isInline\" : false }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        String firstAttachment = firstMessage + ".attachments[0]";
-        String blobId = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".textBody", equalTo("Test body, plain text version"))
-            .body(firstMessage + ".htmlBody", is(nullValue()))
-            .body(firstMessage + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo("text/html; charset=UTF-8"))
-            .body(firstAttachment + ".size", equalTo((int) uploadedAttachment.getSize()))
-            .extract()
-            .jsonPath()
-            .getString(firstAttachment + ".blobId");
-
-        checkBlobContent(blobId, text.getBytes(StandardCharsets.UTF_8));
-    }
-
-    private void checkBlobContent(String blobId, byte[] rawBytes) {
-        byte[] attachmentBytes = with()
-            .header("Authorization", accessToken.asString())
-            .get("/download/" + blobId)
-        .then()
-            .extract()
-            .body()
-            .asByteArray();
-
-        assertThat(new ByteArrayInputStream(attachmentBytes))
-            .hasSameContentAs(new ByteArrayInputStream(rawBytes));
-    }
-
-    @Test
-    public void attachmentAndEmptyBodyShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesWithTextAttachmentWithoutMailBody() throws Exception {
-        String text = "some text";
-        String contentType = "text/plain; charset=UTF-8";
-        AttachmentMetadata uploadedAttachment = uploadTextAttachment(contentType, text);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-            "        \"subject\": \"Message with an attachment\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment.getSize() + ", " +
-            "               \"isInline\" : false }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-            .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        String firstMessage = ARGUMENTS + ".list[0]";
-        String firstAttachment = firstMessage + ".attachments[0]";
-        String blobId = given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(firstMessage + ".textBody", is(nullValue()))
-            .body(firstMessage + ".htmlBody", is(nullValue()))
-            .body(firstMessage + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo("text/plain; charset=UTF-8"))
-            .body(firstAttachment + ".size", equalTo((int) uploadedAttachment.getSize()))
-            .extract()
-            .jsonPath()
-            .getString(firstAttachment + ".blobId");
-
-        checkBlobContent(blobId, text.getBytes(StandardCharsets.UTF_8));
-    }
-
-    @Test
-    public void setMessagesShouldVerifyHeaderOfMessageInInbox() throws Exception {
-        String toUsername = "username1@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(toUsername, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + toUsername + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(toUsername), password);
-        String inboxMailboxId = getMailboxId(accessToken, Role.INBOX);
-
-        calmlyAwait.atMost(60, TimeUnit.SECONDS).until(() -> messageInMailboxHasHeaders(inboxMailboxId, buildExpectedHeaders()));
-
-    }
-
-    @Test
-    public void setMessagesShouldVerifyHeaderOfMessageInSent() throws Exception {
-        String toUsername = "username1@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(toUsername, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + toUsername + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        calmlyAwait.atMost(60, TimeUnit.SECONDS).until(() -> messageInMailboxHasHeaders(sentMailboxId, buildExpectedHeaders()));
-
-    }
-
-    private ImmutableList<String> buildExpectedHeaders() {
-        return ImmutableList.<String>builder()
-            .add("Sender")
-            .add("Content-Transfer-Encoding")
-            .add("From")
-            .add("To")
-            .add("MIME-Version")
-            .add("Subject")
-            .add("Content-Type")
-            .add("Message-ID")
-            .add("Date")
-            .build();
-    }
-
-    private boolean messageInMailboxHasHeaders(String mailboxId, ImmutableList<String> expectedHeaders) {
-        try {
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", "
-                    + "{"
-                    + "\"fetchMessages\": true, "
-                    + "\"fetchMessageProperties\": [\"headers\"], "
-                    + "\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]} "
-                    + "}, \"#0\"]]")
-                .when()
-                    .post("/jmap")
-                .then()
-                    .statusCode(200)
-                    .body(ARGUMENTS + ".messageIds", hasSize(1))
-                    .body(SECOND_NAME, equalTo("messages"))
-                    .body(SECOND_ARGUMENTS + ".list[0]", hasEntry(equalTo("headers"), allHeadersMatcher(expectedHeaders)));
-            return true;
-        } catch (AssertionError e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-
-    private Matcher<Map<? extends String, ? extends String>> allHeadersMatcher(ImmutableList<String> expectedHeaders) {
-        return Matchers.allOf(expectedHeaders.stream()
-                .map((String header) -> hasEntry(equalTo(header), not(is(nullValue()))))
-                .collect(Collectors.toList()));
-    }
-
-    @Test
-    public void setMessagesShouldSetUserAddedHeaders() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"headers\": { \"X-MY-SPECIAL-HEADER\": \"first header value\", \"OTHER-HEADER\": \"other value\"}," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".headers", Matchers.allOf(
-                hasEntry("X-MY-SPECIAL-HEADER", "first header value"),
-                hasEntry("OTHER-HEADER", "other value")));
-    }
-
-    @Test
-    public void setMessagesShouldSetUserAddedHeadersForReplyAndForwardWhenAskedTo() throws Exception {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"headers\": { \"In-Reply-To\": \"inreplyto value\", \"X-Forwarded-Message-Id\": \"forward value\"}," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .<String>path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".headers", Matchers.allOf(
-                hasEntry("In-Reply-To", "inreplyto value"),
-                hasEntry("X-Forwarded-Message-Id", "forward value")));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldUpdateIsAnsweredWhenInReplyToHeaderSentViaOutbox() throws Exception {
-        OriginalMessage firstMessage = receiveFirstMessage();
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"headers\": { \"In-Reply-To\": \"" + firstMessage.mimeMessageId + "\"}," +
-            "        \"subject\": \"RE: Hi!\"," +
-            "        \"textBody\": \"Fine, thank you!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(bobAccessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + firstMessage.jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".keywords.$Answered", equalTo(true))
-            .body(message + ".isAnswered", equalTo(true));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setMessagesShouldUpdateIsForwardedWhenXForwardedHeaderSentViaOutbox() throws Exception {
-        OriginalMessage firstMessage = receiveFirstMessage();
-
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"headers\": { \"X-Forwarded-Message-Id\": \"" + firstMessage.mimeMessageId + "\"}," +
-            "        \"subject\": \"Fwd: Hi!\"," +
-            "        \"textBody\": \"You talking to me?\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(bobAccessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + firstMessage.jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".keywords.$Forwarded", equalTo(true))
-            .body(message + ".isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldUpdateIsAnsweredWhenInReplyToHeaderSentViaDraft() throws Exception {
-        OriginalMessage firstMessage = receiveFirstMessage();
-
-        String draftCreationId = "creationId1337";
-        String createDraft = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + draftCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"headers\": { \"In-Reply-To\": \"" + firstMessage.mimeMessageId + "\"}," +
-            "        \"subject\": \"RE: Hi!\"," +
-            "        \"textBody\": \"Fine, thank you!\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String draftId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(createDraft)
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + draftCreationId + "\"].id");
-
-        String moveDraftToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + draftId + "\" : {" +
-            "        \"keywords\": {}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(moveDraftToOutBox)
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(bobAccessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + firstMessage.jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".keywords.$Answered", equalTo(true))
-            .body(message + ".isAnswered", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldUpdateIsForwardedWhenXForwardedHeaderSentViaDraft() throws Exception {
-        OriginalMessage firstMessage = receiveFirstMessage();
-
-        String draftCreationId = "creationId1337";
-        String createDraft = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + draftCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}]," +
-            "        \"headers\": { \"X-Forwarded-Message-Id\": \"" + firstMessage.mimeMessageId + "\"}," +
-            "        \"subject\": \"Fwd: Hi!\"," +
-            "        \"textBody\": \"You talking to me?\"," +
-            "        \"keywords\": {\"$Draft\": true}," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String draftId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body(createDraft)
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".created[\"" + draftCreationId + "\"].id");
-
-        String moveDraftToOutBox = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + draftId + "\" : {" +
-            "        \"keywords\": {}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(moveDraftToOutBox)
-            .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(bobAccessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + firstMessage.jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".keywords.$Forwarded", equalTo(true))
-            .body(message + ".isForwarded", equalTo(true));
-    }
-
-    private OriginalMessage receiveFirstMessage() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"subject\": \"Hi!\"," +
-            "        \"textBody\": \"How are you?\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String jmapMessageId = with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .extract()
-            .<String>path(ARGUMENTS + ".messageIds[0]");
-
-        String mimeMessageId = with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .<String>path(ARGUMENTS + ".list[0].headers['Message-ID']");
-        return new OriginalMessage(jmapMessageId, mimeMessageId);
-    }
-
-    private static class OriginalMessage {
-        final String jmapMessageId;
-        final String mimeMessageId;
-
-        OriginalMessage(String jmapMessageId, String mimeMessageId) {
-            this.jmapMessageId = jmapMessageId;
-            this.mimeMessageId = mimeMessageId;
-        }
-    }
-
-    @Test
-    public void setMessagesShouldSetUserAddedHeadersInSent() throws Exception {
-        String toUsername = "username1@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(toUsername, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + toUsername + "\"}]," +
-                "        \"headers\": { \"X-MY-SPECIAL-HEADER\": \"first header value\", \"OTHER-HEADER\": \"other value\"}," +
-                "        \"subject\": \"Thank you for joining example.com!\"," +
-                "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-                "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> messageHasBeenMovedToSentBox(sentMailboxId));
-
-        String message = SECOND_ARGUMENTS + ".list[0]";
-        with()
-            .header("Authorization", this.accessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\":true, \"fetchMessageProperties\": [\"headers\"], \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".headers", Matchers.allOf(
-                hasEntry("X-MY-SPECIAL-HEADER", "first header value"),
-                hasEntry("OTHER-HEADER", "other value")));
-    }
-
-    @Test
-    public void setMessagesShouldSetMultivaluedUserAddedHeaders() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"headers\": { \"X-MY-MULTIVALUATED-HEADER\": \"first value\nsecond value\"}," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".headers", hasEntry("X-MY-MULTIVALUATED-HEADER", "first value\nsecond value"));
-    }
-
-    @Test
-    public void setMessagesShouldRenderCorrectlyInIMAPMultivaluedUserAddedHeaders() throws Exception {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"headers\": { \"X-MY-MULTIVALUATED-HEADER\": \"first value\nsecond value\"}," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST_IP, jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(USERNAME, PASSWORD)
-                .select(MailboxConstants.INBOX);
-            assertThat(testIMAPClient.readFirstMessage())
-                .contains("X-MY-MULTIVALUATED-HEADER: first value")
-                .contains("X-MY-MULTIVALUATED-HEADER: second value");
-        }
-    }
-
-    @Test
-    public void setMessagesShouldFilterComputedHeadersFromUserAddedHeaders() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"headers\": { \"From\": \"hacker@example.com\", \"X-MY-SPECIAL-HEADER\": \"first header value\", \"OTHER-HEADER\": \"other value\"}," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".headers", Matchers.allOf(
-                hasEntry("X-MY-SPECIAL-HEADER", "first header value"),
-                hasEntry("OTHER-HEADER", "other value"),
-                not(hasEntry("From", "hacker@example.com")),
-                hasEntry("From", "Me <" + USERNAME.asString() + ">")));
-    }
-
-    @Test
-    public void setMessagesShouldCreateMessageWhenSendingMessageWithNonIndexableAttachment() throws Exception {
-        byte[] bytes = ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html");
-        String contentType = "text/html";
-        AttachmentMetadata uploadedAttachment = uploadAttachment(contentType, bytes);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-                "        \"subject\": \"Message with non indexable attachment\"," +
-                "        \"textBody\": \"Test body\"," +
-                "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-                "        \"attachments\": [" +
-                "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-                "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-                "               \"name\" : \"nonIndexableAttachment.html\", " +
-                "               \"size\" : " + uploadedAttachment.getSize() + "}" +
-                "           ]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        String createdPath = ARGUMENTS + ".created[\"" + messageCreationId + "\"]";
-        String singleAttachment = createdPath + ".attachments[0]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(createdPath + ".attachments", hasSize(1))
-            .body(singleAttachment + ".type", equalTo("text/html; charset=UTF-8; name=\"=?US-ASCII?Q?nonIndexableAttachment.html?=\""))
-            .body(singleAttachment + ".size", equalTo((int) uploadedAttachment.getSize()));
-    }
-
-    @Test
-    public void messageWithNonIndexableAttachmentShouldBeRetrievedWhenChainingSetMessagesAndGetMessages() throws Exception {
-        byte[] bytes = ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html");
-        String contentType = "text/html";
-        AttachmentMetadata uploadedAttachment = uploadAttachment(contentType, bytes);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-                "        \"subject\": \"Message with non indexable attachment\"," +
-                "        \"textBody\": \"Test body\"," +
-                "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-                "        \"attachments\": [" +
-                "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-                "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-                "               \"name\" : \"nonIndexableAttachment.html\", " +
-                "               \"size\" : " + uploadedAttachment.getSize() + "}" +
-                "           ]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        String messageId = with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        // When
-        .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".attachments", hasSize(1));
-    }
-
-    @Test
-    public void messageWithNonIndexableAttachmentShouldHaveItsEmailBodyIndexed() throws Exception {
-        byte[] bytes = ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html");
-        String contentType = "text/html";
-        AttachmentMetadata uploadedAttachment = uploadAttachment(contentType, bytes);
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}]," +
-                "        \"subject\": \"Message with non indexable attachment\"," +
-                "        \"textBody\": \"Test body\"," +
-                "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-                "        \"attachments\": [" +
-                "               {\"blobId\" : \"" + uploadedAttachment.getAttachmentId().getId() + "\", " +
-                "               \"type\" : \"" + uploadedAttachment.getType().asString() + "\", " +
-                "               \"name\" : \"nonIndexableAttachment.html\", " +
-                "               \"size\" : " + uploadedAttachment.getSize() + "}" +
-                "           ]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .post("/jmap");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessageList\", {\"filter\":{" +
-                "   \"body\": \"Test body\", " +
-                "   \"inMailboxes\":[\"" + inboxId  + "\"]}}, " +
-                "\"#0\"]]")
-            .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messageList"))
-            .body(ARGUMENTS + ".messageIds", hasSize(1));
-    }
-
-    @Test
-    public void setMessagesShouldReturnAttachmentsWhenMessageHasInlinedAttachmentButNoCid() throws Exception {
-        String bytes = "attachment";
-        AttachmentMetadata uploadedAttachment1 = uploadAttachment(OCTET_CONTENT_TYPE_UTF8, bytes.getBytes(StandardCharsets.UTF_8));
-        String bytes2 = "attachment2";
-        AttachmentMetadata uploadedAttachment2 = uploadAttachment(OCTET_CONTENT_TYPE_UTF8, bytes2.getBytes(StandardCharsets.UTF_8));
-
-        String messageCreationId = "creationId";
-        String fromAddress = USERNAME.asString();
-        String outboxId = getOutboxId(accessToken);
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"Message with two attachments\"," +
-            "        \"textBody\": \"Test body\"," +
-            "        \"mailboxIds\": [\"" + outboxId + "\"], " +
-            "        \"attachments\": [" +
-            "               {\"blobId\" : \"" + uploadedAttachment1.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment1.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment1.getSize() + "}," +
-            "               {\"blobId\" : \"" + uploadedAttachment2.getAttachmentId().getId() + "\", " +
-            "               \"type\" : \"" + uploadedAttachment2.getType().asString() + "\", " +
-            "               \"size\" : " + uploadedAttachment2.getSize() + ", " +
-            "               \"isInline\" : true }" +
-            "           ]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String createdPath = ARGUMENTS + ".created[\"" + messageCreationId + "\"]";
-
-        String json = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1))
-            .body(createdPath + ".attachments", hasSize(2))
-            .extract()
-            .asString();
-
-        assertThatJson(json)
-            .withOptions(new Options(Option.TREATING_NULL_AS_ABSENT, Option.IGNORING_ARRAY_ORDER, Option.IGNORING_EXTRA_FIELDS))
-            .inPath(createdPath + ".attachments")
-            .isEqualTo("[{" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes2.length() + "," +
-                "  \"isInline\":false" +
-                "}, {" +
-                "  \"type\":\"application/octet-stream; charset=UTF-8\"," +
-                "  \"size\":" + bytes.length() + "," +
-                "  \"isInline\":false" + // See JAMES-2258 inline should be false in case of no Content-ID for inlined attachment
-                // Stored attachment will not be considered as having an inlined attachment.
-                "}]");
-    }
-
-    @Test
-    public void setMessageWithUpdateShouldBeOKWhenKeywordsWithCustomFlagArePassed() throws MailboxException {
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME.asString(), "mailbox");
-
-        ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX,
-                new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
-
-        String messageId = message.getMessageId().serialize();
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(String.format("[[\"setMessages\", {\"update\": {\"%s\" : { \"keywords\": {\"$Seen\": true, \"$Unknown\": true} } } }, \"#0\"]]", messageId))
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .spec(getSetMessagesUpdateOKResponseAssertions(messageId));
-    }
-
-    @Test
-    public void setMessageWithCreationShouldBeOKWhenKeywordsWithCustomFlagArePassed() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + messageCreationId  + "\" : {" +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-                "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-                "        \"subject\": \"subject\"," +
-                "        \"keywords\": {\"$Answered\": true, \"$Unknown\": true}," +
-                "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("messagesSet"))
-            .body(ARGUMENTS + ".notCreated", aMapWithSize(0))
-            .body(ARGUMENTS + ".created", aMapWithSize(1));
-    }
-
-    @Test
-    public void setMessageWithCreationShouldThrowWhenKeywordsWithUnsupportedArePassed() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"keywords\": {\"$Answered\": true, \"$Deleted\": true}," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", containsString("Does not allow to update 'Deleted' or 'Recent' flag"));
-    }
-
-    @Test
-    public void textBodyOfMessageWithTextCalendarShouldBeConvertedToAttachment() throws Exception {
-        MimeMessage calendarMessage = MimeMessageUtil.mimeMessageFromStream(ClassLoader.getSystemResourceAsStream("eml/calendar.eml"));
-        String fromAddress = USERNAME.asString();
-
-        Mail mail = FakeMail.builder()
-            .name("name")
-            .mimeMessage(calendarMessage)
-            .sender(fromAddress)
-            .recipient(fromAddress)
-            .build();
-        try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, jmapServer.getProbe(SmtpGuiceProbe.class).getSmtpPort().getValue(), DOMAIN)) {
-            messageSender.authenticate(USERNAME.asString(), PASSWORD).sendMessage(mail);
-        }
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String message = ARGUMENTS + ".list[0]";
-        String firstAttachment = message + ".attachments[0]";
-
-        String inboxId = getMailboxId(accessToken, Role.INBOX);
-        String receivedMessageId =
-            with()
-                .header("Authorization", accessToken.asString())
-                .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + inboxId + "\"]}}, \"#0\"]]")
-                .post("/jmap")
-            .then()
-                .extract()
-                .path(ARGUMENTS + ".messageIds[0]");
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + receivedMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(message + ".attachments", hasSize(1))
-            .body(firstAttachment + ".type", equalTo("text/calendar; method=REPLY; charset=UTF-8"))
-            .body(firstAttachment + ".blobId", not(is(nullValue())));
-    }
-
-    @Test
-    public void setMessagesShouldSetTheSeenKeywordOnMessageInSentMailbox() throws Exception {
-        // Sender
-        String sentMailboxId = getMailboxId(accessToken, Role.SENT);
-
-        // Recipient
-        String recipientAddress = "recipient" + "@" + DOMAIN;
-        String password = "password";
-        dataProbe.addUser(recipientAddress, password);
-        mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
-
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"recipient\", \"email\": \"" + recipientAddress + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        // Given
-        given()
-            .header("Authorization", this.accessToken.asString())
-            .body(requestBody)
-        // When
-        .when()
-            .post("/jmap");
-
-        // Then
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> messageHasBeenMovedToSentBox(sentMailboxId));
-        with()
-            .header("Authorization", this.accessToken.asString())
-            .body("[[\"getMessageList\", {\"fetchMessages\":true, \"fetchMessageProperties\": [\"keywords\"], \"filter\":{\"inMailboxes\":[\"" + sentMailboxId + "\"]}}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .statusCode(200)
-            .body(SECOND_NAME, equalTo("messages"))
-            .body(SECOND_ARGUMENTS + ".list", hasSize(1))
-            .body(SECOND_ARGUMENTS + ".list[0].keywords.$Seen", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldCreateMessageWithFlagsWhenFlagsAttributesAreGiven() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isUnread\": true," +
-            "        \"isFlagged\": true," +
-            "        \"isAnswered\": true," +
-            "        \"isDraft\": true," +
-            "        \"isForwarded\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isFlagged", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isAnswered", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isDraft", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldUpdateFlagsWhenSomeAreAlreadySet() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isDraft\": true," +
-            "        \"isForwarded\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        String updateRequestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId  + "\" : {" +
-                "        \"isUnread\": true," +
-                "        \"isFlagged\": true," +
-                "        \"isAnswered\": true," +
-                "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(updateRequestBody)
-        .when()
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isFlagged", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isAnswered", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isDraft", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldRemoveFlagsWhenAskedFor() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isUnread\": true," +
-            "        \"isFlagged\": true," +
-            "        \"isAnswered\": true," +
-            "        \"isDraft\": true," +
-            "        \"isForwarded\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        String updateRequestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId  + "\" : {" +
-                "        \"isUnread\": false," +
-                "        \"isFlagged\": false," +
-                "        \"isAnswered\": false," +
-                "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(updateRequestBody)
-        .when()
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isFlagged", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isAnswered", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isDraft", equalTo(true))
-            .body(ARGUMENTS + ".list[0].isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void setMessagesShouldNotReturnAnErrorWhenTryingToChangeDraftFlagAmongOthers() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isUnread\": true," +
-            "        \"isFlagged\": true," +
-            "        \"isAnswered\": true," +
-            "        \"isDraft\": true," +
-            "        \"isForwarded\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        String updateRequestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId  + "\" : {" +
-                "        \"isUnread\": false," +
-                "        \"isFlagged\": false," +
-                "        \"isAnswered\": false," +
-                "        \"isDraft\": false," +
-                "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(updateRequestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".updated", hasSize(1))
-            .body(ARGUMENTS + ".updated", contains(messageId));
-
-    }
-
-    @Test
-    public void setMessagesShouldModifyTheMessageWhenTryingToChangeDraftFlagAmongOthers() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
-            "        \"subject\": \"subject\"," +
-            "        \"isUnread\": true," +
-            "        \"isFlagged\": true," +
-            "        \"isAnswered\": true," +
-            "        \"isDraft\": true," +
-            "        \"isForwarded\": true," +
-            "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String messageId = given()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".id");
-
-        String updateRequestBody = "[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId  + "\" : {" +
-                "        \"isUnread\": false," +
-                "        \"isFlagged\": false," +
-                "        \"isAnswered\": false," +
-                "        \"isDraft\": false," +
-                "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(updateRequestBody)
-        .when()
-            .post("/jmap");
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + messageId + "\"]}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .body(NAME, equalTo("messages"))
-            .body(ARGUMENTS + ".list", hasSize(1))
-            .body(ARGUMENTS + ".list[0].isUnread", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isFlagged", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isAnswered", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isDraft", equalTo(false))
-            .body(ARGUMENTS + ".list[0].isForwarded", equalTo(true));
-    }
-
-    @Test
-    public void mimeMessageIdShouldBePreservedWhenSending() {
-        String messageCreationId = "creationId1337";
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
-            "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + USERNAME.asString() + "\"}]," +
-            "        \"subject\": \"Hi!\"," +
-            "        \"textBody\": \"How are you?\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        String creationMimeMessageId = given()
-            .header("Authorization", bobAccessToken.asString())
-            .body(requestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .body()
-            .path(ARGUMENTS + ".created." + messageCreationId + ".headers['Message-ID']");
-
-        calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
-
-        String jmapMessageId = with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .path(ARGUMENTS + ".messageIds[0]");
-
-        String receivedMimeMessageId = with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessages\", {\"ids\": [\"" + jmapMessageId + "\"]}, \"#0\"]]")
-        .when()
-            .post("/jmap")
-        .then()
-            .extract()
-            .path(ARGUMENTS + ".list[0].headers['Message-ID']");
-
-        assertThat(receivedMimeMessageId).isEqualTo(creationMimeMessageId);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java
deleted file mode 100644
index 54e16e93b6e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.with;
-import static io.restassured.config.EncoderConfig.encoderConfig;
-import static io.restassured.config.RestAssuredConfig.newConfig;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB;
-import static org.apache.james.jmap.JMAPTestingConstants.BOB_PASSWORD;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
-import static org.apache.james.jmap.JmapCommonRequests.getSetMessagesUpdateOKResponseAssertions;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.HttpJmapAuthentication;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.probe.MailboxProbe;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.queue.api.MailQueue;
-import org.apache.james.queue.api.MailQueueFactory;
-import org.apache.james.queue.api.MailQueueName;
-import org.apache.james.utils.DataProbeImpl;
-import org.apache.mailet.Mail;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.reactivestreams.Publisher;
-
-import com.github.fge.lambdas.Throwing;
-
-import io.restassured.RestAssured;
-import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.http.ContentType;
-import io.restassured.parsing.Parser;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public abstract class SetMessagesOutboxFlagUpdateTest {
-    private static final Username USERNAME = Username.of("username@" + DOMAIN);
-    private static final String PASSWORD = "password";
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken accessToken;
-    private GuiceJamesServer jmapServer;
-
-    protected MailQueueFactory<MailQueue> noopMailQueueFactory = new MailQueueFactory<MailQueue>() {
-        @Override
-        public Optional<MailQueue> getQueue(MailQueueName name, PrefetchCount prefetchCount) {
-            return Optional.of(createQueue(name));
-        }
-
-        @Override
-        public MailQueue createQueue(MailQueueName name, PrefetchCount prefetchCount) {
-            return new MailQueue() {
-                @Override
-                public void close() throws IOException {
-                }
-
-                @Override
-                public MailQueueName getName() {
-                    return name;
-                }
-
-                @Override
-                public void enQueue(Mail mail, Duration delay) {
-                }
-
-                @Override
-                public Publisher<Void> enqueueReactive(Mail mail) {
-                    return Mono.fromRunnable(Throwing.runnable(() -> enQueue(mail)).sneakyThrow());
-                }
-
-                @Override
-                public void enQueue(Mail mail) {
-
-                }
-
-                @Override
-                public Flux<MailQueueItem> deQueue() {
-                    return Flux.never();
-                }
-            };
-        }
-
-        @Override
-        public Set<MailQueueName> listCreatedMailQueues() {
-            throw new NotImplementedException("Minimalistic implementation. Please do not list queues");
-        }
-    };
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        MailboxProbe mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-
-        RestAssured.requestSpecification = new RequestSpecBuilder()
-                .setContentType(ContentType.JSON)
-                .setAccept(ContentType.JSON)
-                .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
-                .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
-                .build();
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-        RestAssured.defaultParser = Parser.JSON;
-
-        dataProbe.addDomain(DOMAIN);
-        dataProbe.addUser(USERNAME.asString(), PASSWORD);
-        dataProbe.addUser(BOB.asString(), BOB_PASSWORD);
-        mailboxProbe.createMailbox("#private", USERNAME.asString(), DefaultMailboxes.INBOX);
-        accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), USERNAME, PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void flagsUpdateShouldBeAllowedInTheOutbox() {
-        String messageCreationId = "creationId1337";
-        String fromAddress = USERNAME.asString();
-        String toUsername = USERNAME.asString();
-        String requestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + toUsername + "\"}]," +
-            "        \"subject\": \"Thank you for joining example.com!\"," +
-            "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
-            "        \"mailboxIds\": [\"" + getOutboxId(accessToken) + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        with()
-            .header("Authorization", accessToken.asString())
-            .body(requestBody)
-            .post("/jmap");
-
-        String jmapMessageId = with()
-            .header("Authorization", accessToken.asString())
-            .body("[[\"getMessageList\", {}, \"#0\"]]")
-            .post("/jmap")
-        .then()
-            .extract()
-            .<String>path(ARGUMENTS + ".messageIds[0]");
-
-
-        String updateRequestBody = "[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + jmapMessageId  + "\" : {" +
-            "        \"isUnread\": false" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(updateRequestBody)
-        .when()
-            .post("/jmap")
-        .then()
-            .log().ifValidationFails()
-            .spec(getSetMessagesUpdateOKResponseAssertions(jmapMessageId));
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java
deleted file mode 100644
index 18ccff4d451..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration;
-
-import static io.restassured.RestAssured.given;
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.io.IOException;
-import java.time.ZonedDateTime;
-import java.util.Optional;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.api.model.AccountId;
-import org.apache.james.vacation.api.Vacation;
-import org.apache.james.vacation.api.VacationPatch;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.junit.categories.BasicFeature;
-import org.apache.james.util.ValuePatch;
-import org.apache.james.utils.DataProbeImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-
-public abstract class SetVacationResponseTest {
-
-    public static final String USER = "username@" + DOMAIN;
-    public static final String PASSWORD = "password";
-    public static final String SUBJECT = "subject";
-    private JmapGuiceProbe jmapGuiceProbe;
-
-    protected abstract GuiceJamesServer createJmapServer() throws IOException;
-
-    private AccessToken accessToken;
-    private GuiceJamesServer jmapServer;
-
-    @Before
-    public void setup() throws Throwable {
-        jmapServer = createJmapServer();
-        jmapServer.start();
-        jmapGuiceProbe = jmapServer.getProbe(JmapGuiceProbe.class);
-        RestAssured.requestSpecification = jmapRequestSpecBuilder
-                .setPort(jmapGuiceProbe.getJmapPort().getValue())
-                .build();
-
-        jmapServer.getProbe(DataProbeImpl.class)
-            .fluent()
-            .addDomain(DOMAIN)
-            .addUser(USER, PASSWORD);
-        accessToken = authenticateJamesUser(baseUri(jmapServer), Username.of(USER), PASSWORD);
-    }
-
-    @After
-    public void teardown() {
-        jmapServer.stop();
-    }
-
-    @Test
-    public void setVacationResponseShouldReturnErrorOnMalformedRequestStructure() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"idVacation\" : {" +
-                        "\"id\": \"1\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("update field should just contain one entry with key \"singleton\""));
-    }
-
-    @Test
-    public void setVacationResponseShouldBeAbleToContainIsActivated() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-                "{" +
-                    "\"update\":{" +
-                        "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"isActivated\": \"true\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .accept(ContentType.JSON)
-            .contentType(ContentType.JSON)
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-    }
-
-    @Test
-    public void setVacationResponseShouldContainAnErrorWhenInvalidId() {
-        int id = 1;
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"" + id + "\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".notUpdated.singleton.type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".notUpdated.singleton.description", equalTo("There is one VacationResponse object per account, with id set to \\\"singleton\\\" and not to " + id));
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setVacationResponseShouldReturnCorrectAnswerUponValidVacationResponse() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"," +
-                        "\"htmlBody\": \"<p>Here is the HTML version</p>\"," +
-                        "\"fromDate\":\"2014-09-30T14:10:00Z[GMT]\"," +
-                        "\"toDate\":\"2014-10-30T14:10:00Z[GMT]\"," +
-                        "\"subject\":\"" + SUBJECT + "\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-
-        Vacation vacation = jmapGuiceProbe.retrieveVacation(AccountId.fromString(USER));
-        assertThat(vacation.getTextBody()).contains("Message explaining my wonderful vacations");
-        assertThat(vacation.getHtmlBody()).contains("<p>Here is the HTML version</p>");
-        assertThat(vacation.isEnabled()).isTrue();
-        assertThat(vacation.getFromDate()).contains(ZonedDateTime.parse("2014-09-30T14:10:00Z[GMT]"));
-        assertThat(vacation.getToDate()).contains(ZonedDateTime.parse("2014-10-30T14:10:00Z[GMT]"));
-        assertThat(vacation.getSubject()).contains(SUBJECT);
-    }
-
-    @Category(BasicFeature.class)
-    @Test
-    public void setVacationResponseShouldAllowResets() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
-            VacationPatch.builder()
-                .textBody(ValuePatch.modifyTo("any value"))
-                .build());
-
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"textBody\": null" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-
-        assertThat(jmapGuiceProbe.retrieveVacation(AccountId.fromString(USER)))
-            .isEqualTo(Vacation.builder()
-                .enabled(false)
-                .build());
-    }
-
-    @Test
-    public void setVacationResponseShouldNotAlterAbsentProperties() {
-        String textBody = "any value";
-        String subject = "any subject";
-        jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
-            VacationPatch.builder()
-                .textBody(ValuePatch.modifyTo(textBody))
-                .build());
-
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"subject\": \"" + subject + "\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .accept(ContentType.JSON)
-            .contentType(ContentType.JSON)
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-            .when()
-            .post("/jmap")
-            .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-
-        assertThat(jmapGuiceProbe.retrieveVacation(AccountId.fromString(USER)))
-            .isEqualTo(Vacation.builder()
-                .enabled(false)
-                .subject(Optional.of(subject))
-                .textBody(textBody)
-                .build());
-    }
-
-    @Test
-    public void setVacationResponseShouldAllowPartialUpdates() {
-        jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
-            VacationPatch.builder()
-                .textBody(ValuePatch.modifyTo("any value"))
-                .build());
-
-        String newTextBody = "Awesome text message 2";
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"textBody\": \"" + newTextBody + "\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-            .when()
-            .post("/jmap")
-            .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-
-        assertThat(jmapGuiceProbe.retrieveVacation(AccountId.fromString(USER)))
-            .isEqualTo(Vacation.builder()
-                .enabled(false)
-                .textBody(newTextBody)
-                .build());
-    }
-
-    @Test
-    public void setVacationResponseShouldHandleNamedTimeZone() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"," +
-                        "\"fromDate\":\"2016-04-03T02:01+07:00[Asia/Vientiane]\"," +
-                        "\"toDate\":\"2016-04-07T02:01+07:00[Asia/Vientiane]\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-            .when()
-            .post("/jmap")
-            .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-
-        Vacation vacation = jmapGuiceProbe.retrieveVacation(AccountId.fromString(USER));
-        assertThat(vacation.getTextBody()).contains("Message explaining my wonderful vacations");
-        assertThat(vacation.isEnabled()).isTrue();
-        assertThat(vacation.getFromDate()).contains(ZonedDateTime.parse("2016-04-03T02:01+07:00[Asia/Vientiane]"));
-        assertThat(vacation.getToDate()).contains(ZonedDateTime.parse("2016-04-07T02:01+07:00[Asia/Vientiane]"));
-    }
-
-    @Test
-    public void accountIdIsNotSupported() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"accountId\": \"1\"," +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"," +
-                        "\"fromDate\":\"2014-09-30T14:10:00Z\"," +
-                        "\"toDate\":\"2014-10-30T14:10:00Z\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("error"))
-            .body(ARGUMENTS + ".type", equalTo("invalidArguments"))
-            .body(ARGUMENTS + ".description", equalTo("The field 'accountId' of 'SetVacationRequest' is not supported"));
-    }
-
-    @Test
-    public void accountIdNullIsSupported() {
-        String bodyRequest = "[[" +
-            "\"setVacationResponse\", " +
-            "{" +
-                "\"accountId\": null," +
-                "\"update\":{" +
-                    "\"singleton\" : {" +
-                        "\"id\": \"singleton\"," +
-                        "\"isEnabled\": \"true\"," +
-                        "\"textBody\": \"Message explaining my wonderful vacations\"," +
-                        "\"fromDate\":\"2014-09-30T14:10:00Z\"," +
-                        "\"toDate\":\"2014-10-30T14:10:00Z\"" +
-                    "}" +
-                "}" +
-            "}, " +
-            "\"#0\"" +
-            "]]";
-
-        given()
-            .accept(ContentType.JSON)
-            .contentType(ContentType.JSON)
-            .header("Authorization", accessToken.asString())
-            .body(bodyRequest)
-        .when()
-            .post("/jmap")
-        .then()
-            .statusCode(200)
-            .body(NAME, equalTo("vacationResponseSet"))
-            .body(ARGUMENTS + ".updated[0]", equalTo("singleton"));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ContentType.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ContentType.java
deleted file mode 100644
index ef477ea7fa0..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ContentType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import java.util.Optional;
-
-public class ContentType {
-
-    public static ContentType from(String contentType) {
-        return new ContentType(Optional.ofNullable(contentType));
-    }
-
-    public static ContentType noContentType() {
-        return new ContentType(Optional.empty());
-    }
-
-    private final Optional<String> contentType;
-
-    private ContentType(Optional<String> contentType) {
-        this.contentType = contentType;
-    }
-
-    public Optional<String> value() {
-        return contentType;
-    }
-
-    public String serializeToHeader() {
-        return contentType
-                .map(value -> "Content-Type: " + value + "\r\n")
-                .orElse("");
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
deleted file mode 100644
index cc412e7e84e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/DownloadStepdefs.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import jakarta.inject.Inject;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.fluent.Request;
-import org.apache.http.client.fluent.Response;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.draft.model.AttachmentAccessToken;
-import org.apache.james.mailbox.MessageManager.AppendCommand;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.AttachmentId;
-import org.apache.james.mailbox.model.ByteContent;
-import org.apache.james.mailbox.model.ByteSourceContent;
-import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mime4j.codec.DecoderUtil;
-import org.apache.james.util.ClassLoaderUtils;
-import org.apache.james.util.io.InputStreamUtils;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class DownloadStepdefs {
-
-    private static final String ONE_ATTACHMENT_EML_ATTACHMENT_BLOB_ID = "913ee2d903a68c3e8cb51169d34cf9ec257323c1bee254c0c7ab820930fdb8e7";
-    private static final String EXPIRED_ATTACHMENT_TOKEN = "usera@domain.tld_"
-            + "2016-06-29T13:41:22.124Z_"
-            + "DiZa0O14MjLWrAA8P6MG35Gt5CBp7mt5U1EH/M++rIoZK7nlGJ4dPW0dvZD7h4m3o5b/Yd8DXU5x2x4+s0HOOKzD7X0RMlsU7JHJMNLvTvRGWF/C+MUyC8Zce7DtnRVPEQX2uAZhL2PBABV07Vpa8kH+NxoS9CL955Bc1Obr4G+KN2JorADlocFQA6ElXryF5YS/HPZSvq1MTC6aJIP0ku8WRpRnbwgwJnn26YpcHXcJjbkCBtd9/BhlMV6xNd2hTBkfZmYdoNo+UKBaXWzLxAlbLuxjpxwvDNJfOEyWFPgHDoRvzP+G7KzhVWjanHAHrhF0GilEa/MKpOI1qHBSwA==";
-    private static final String INVALID_ATTACHMENT_TOKEN = "usera@domain.tld_"
-            + "2015-06-29T13:41:22.124Z_"
-            + "DiZa0O14MjLWrAA8P6MG35Gt5CBp7mt5U1EH/M++rIoZK7nlGJ4dPW0dvZD7h4m3o5b/Yd8DXU5x2x4+s0HOOKzD7X0RMlsU7JHJMNLvTvRGWF/C+MUyC8Zce7DtnRVPEQX2uAZhL2PBABV07Vpa8kH+NxoS9CL955Bc1Obr4G+KN2JorADlocFQA6ElXryF5YS/HPZSvq1MTC6aJIP0ku8WRpRnbwgwJnn26YpcHXcJjbkCBtd9/BhlMV6xNd2hTBkfZmYdoNo+UKBaXWzLxAlbLuxjpxwvDNJfOEyWFPgHDoRvzP+G7KzhVWjanHAHrhF0GilEa/MKpOI1qHBSwA==";
-    private static final String UTF8_CONTENT_DIPOSITION_START = "Content-Disposition: attachment; filename*=\"";
-
-    private final UserStepdefs userStepdefs;
-    private final MainStepdefs mainStepdefs;
-    private final GetMessagesMethodStepdefs getMessagesMethodStepdefs;
-    private HttpResponse response;
-    private Multimap<String, String> attachmentsByMessageId;
-    private Map<String, String> blobIdByAttachmentId;
-    private Map<String, MessageId> inputToMessageId;
-    private Map<AttachmentAccessTokenKey, AttachmentAccessToken> attachmentAccessTokens;
-
-    @Inject
-    private DownloadStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs, GetMessagesMethodStepdefs getMessagesMethodStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.userStepdefs = userStepdefs;
-        this.getMessagesMethodStepdefs = getMessagesMethodStepdefs;
-        this.attachmentsByMessageId = ArrayListMultimap.create();
-        this.blobIdByAttachmentId = new HashMap<>();
-        this.attachmentAccessTokens = new HashMap<>();
-        this.inputToMessageId = new HashMap<>();
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\"$")
-    public void appendMessageToMailbox(String user, String mailbox, String messageId) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(ClassLoaderUtils.getSystemResourceAsSharedStream("eml/oneAttachment.eml")));
-
-        inputToMessageId.put(messageId, composedMessageId.getMessageId());
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a big message \"([^\"]*)\"$")
-    public void appendBigMessageToMailbox(String user, String mailbox, String messageId) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(new ByteContent(
-                Strings.repeat("header: 0123456789\r\n", 128 * 1024)
-                    .getBytes(StandardCharsets.UTF_8))));
-
-        inputToMessageId.put(messageId, composedMessageId.getMessageId());
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\" with an attachment \"([^\"]*)\"$")
-    public void appendMessageWithAttachmentToMailbox(String user, String mailbox, String messageId, String attachmentId) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(ClassLoaderUtils.getSystemResourceAsSharedStream("eml/oneAttachment.eml")));
-
-        retrieveAndSaveAttachmentDetails(user, messageId, attachmentId, composedMessageId);
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\" with an attachment \"([^\"]*)\" having \"([^\"]*)\" contentType$")
-    public void appendMessageWithAttachmentToMailbox(String user, String mailbox, String messageId, String attachmentId, String contentType) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        InputStream message = InputStreamUtils.concat(
-            ClassLoaderUtils.getSystemResourceAsSharedStream("eml/oneAttachment-part1.eml"),
-            new ByteArrayInputStream(contentType.getBytes(StandardCharsets.UTF_8)),
-            ClassLoaderUtils.getSystemResourceAsSharedStream("eml/oneAttachment-part2.eml"));
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(ByteSourceContent.of(message)));
-
-        retrieveAndSaveAttachmentDetails(user, messageId, attachmentId, composedMessageId);
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\" with an inlined attachment \"([^\"]*)\"$")
-    public void appendMessageWithInlinedAttachmentToMailbox(String user, String mailbox, String messageId, String attachmentId) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(ClassLoaderUtils.getSystemResourceAsSharedStream("eml/oneInlinedImage.eml")));
-
-        retrieveAndSaveAttachmentDetails(user, messageId, attachmentId, composedMessageId);
-    }
-
-    public void retrieveAndSaveAttachmentDetails(String user, String messageId, String attachmentId, ComposedMessageId composedMessageId) throws MailboxException {
-        AttachmentId mailboxAttachmentId = mainStepdefs.messageIdProbe
-            .retrieveAttachmentIds(composedMessageId.getMessageId(), Username.of(user))
-            .get(0);
-
-        inputToMessageId.put(messageId, composedMessageId.getMessageId());
-        attachmentsByMessageId.put(messageId, attachmentId);
-        blobIdByAttachmentId.put(attachmentId, mailboxAttachmentId.getId());
-    }
-
-    @Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\" with multiple same inlined attachments \"([^\"]*)\"$")
-    public void appendMessageWithSameInlinedAttachmentsToMailbox(String user, String mailbox, String messageName, String attachmentId) throws Throwable {
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(user), mailbox);
-
-        ComposedMessageId composedMessageId = mainStepdefs.mailboxProbe.appendMessage(user, mailboxPath,
-            AppendCommand.from(ClassLoaderUtils.getSystemResourceAsSharedStream("eml/sameInlinedImages.eml")));
-
-        retrieveAndSaveAttachmentDetails(user, messageName, attachmentId, composedMessageId);
-    }
-
-    @When("^\"([^\"]*)\" checks for the availability of the attachment endpoint$")
-    public void optionDownload(String username) throws Throwable {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        URI target = baseUri(mainStepdefs.jmapServer).setPath("/download/" + ONE_ATTACHMENT_EML_ATTACHMENT_BLOB_ID).build();
-        Request request = Request.Options(target);
-        if (accessToken != null) {
-            request.addHeader("Authorization", accessToken.asString());
-        }
-        response = request.execute().returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" downloads \"([^\"]*)\"$")
-    public void downloads(String username, String blobId) throws Throwable {
-        String attachmentIdOrMessageId = Optional.ofNullable(blobIdByAttachmentId.get(blobId))
-            .orElse(Optional.ofNullable(inputToMessageId.get(blobId))
-                .map(MessageId::serialize)
-                .orElse(null));
-
-        downLoad(username, attachmentIdOrMessageId);
-    }
-
-    @When("^\"([^\"]*)\" downloads \"([^\"]*)\" using query parameter strategy$")
-    public void downloadsUsingQueryParameter(String username, String blobId) throws Throwable {
-        String attachmentIdOrMessageId = Optional.ofNullable(blobIdByAttachmentId.get(blobId))
-            .orElse(Optional.ofNullable(inputToMessageId.get(blobId))
-                .map(MessageId::serialize)
-                .orElse(null));
-        URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/" + attachmentIdOrMessageId);
-        response = queryParameterDownloadRequest(uriBuilder, attachmentIdOrMessageId, username).execute().returnResponse();
-    }
-
-    @When("^un-authenticated user downloads \"([^\"]*)\"$")
-    public void downloadsUnAuthenticated(String blobId) throws Throwable {
-        String attachmentIdOrMessageId = Optional.ofNullable(blobIdByAttachmentId.get(blobId))
-            .orElse(Optional.ofNullable(inputToMessageId.get(blobId))
-                .map(MessageId::serialize)
-                .orElse(null));
-
-        response = Request.Get(
-            baseUri(mainStepdefs.jmapServer)
-                .setPath("/download/" + attachmentIdOrMessageId)
-                .build())
-            .execute()
-            .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" downloads the message by its blobId$")
-    public void downloads(String username) throws Throwable {
-        downLoad(username, getMessagesMethodStepdefs.getBlobId());
-    }
-
-    private void downLoad(String username, String blobId) throws IOException, URISyntaxException {
-        URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId);
-        response = authenticatedDownloadRequest(uriBuilder, blobId, username).execute().returnResponse();
-    }
-
-    private Request authenticatedDownloadRequest(URIBuilder uriBuilder, String blobId, String username) throws URISyntaxException {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
-        if (attachmentAccessTokens.containsKey(key)) {
-            uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
-            return Request.Get(uriBuilder.build());
-        } else {
-            Request request = Request.Get(uriBuilder.build());
-            if (accessToken != null) {
-                request.addHeader("Authorization", accessToken.asString());
-            }
-            return request;
-        }
-    }
-
-    private Request queryParameterDownloadRequest(URIBuilder uriBuilder, String blobId, String username) throws URISyntaxException {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
-        uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
-        return Request.Get(uriBuilder.build());
-    }
-
-    @When("^\"([^\"]*)\" is trusted for attachment \"([^\"]*)\"$")
-    public void attachmentAccessTokenFor(String username, String attachmentId) throws Throwable {
-        userStepdefs.connectUser(username);
-        trustForBlobId(blobIdByAttachmentId.get(attachmentId), username);
-    }
-
-    private static class AttachmentAccessTokenKey {
-
-        private String username;
-        private String blobId;
-
-        public AttachmentAccessTokenKey(String username, String blobId) {
-            this.username = username;
-            this.blobId = blobId;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof AttachmentAccessTokenKey) {
-                AttachmentAccessTokenKey other = (AttachmentAccessTokenKey) obj;
-                return Objects.equal(username, other.username)
-                    && Objects.equal(blobId, other.blobId);
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(username, blobId);
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects
-                    .toStringHelper(this)
-                    .add("username", username)
-                    .add("blobId", blobId)
-                    .toString();
-        }
-    }
-
-    private void trustForBlobId(String blobId, String username) throws Exception {
-        Response tokenGenerationResponse = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
-            .addHeader("Authorization", userStepdefs.authenticate(username).asString())
-            .execute();
-        String serializedAttachmentAccessToken = tokenGenerationResponse.returnContent().asString();
-        attachmentAccessTokens.put(
-                new AttachmentAccessTokenKey(username, blobId),
-                AttachmentAccessToken.from(
-                    serializedAttachmentAccessToken,
-                    blobId));
-    }
-
-    @When("^\"([^\"]*)\" downloads \"(?:[^\"]*)\" with a valid authentication token but a bad blobId$")
-    public void downloadsWithValidToken(String username) {
-        userStepdefs.execWithUser(username, () -> {
-            URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/badblobId");
-            response = Request.Get(uriBuilder.build())
-                .addHeader("Authorization", userStepdefs.authenticate(username).asString())
-                .execute()
-                .returnResponse();
-
-        });
-    }
-
-    @When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" without any authentication token$")
-    public void getDownloadWithoutToken(String attachmentId) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        response = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
-            .execute()
-            .returnResponse();
-    }
-
-    @When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" with an empty authentication token$")
-    public void getDownloadWithEmptyToken(String attachmentId) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        response = Request.Get(
-                baseUri(mainStepdefs.jmapServer)
-                    .setPath("/download/" + blobId)
-                    .addParameter("access_token", "")
-                    .build())
-                .execute()
-                .returnResponse();
-    }
-
-    @When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" with a bad authentication token$")
-    public void getDownloadWithBadToken(String attachmentId) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        response = Request.Get(
-                baseUri(mainStepdefs.jmapServer)
-                    .setPath("/download/" + blobId)
-                    .addParameter("access_token", "bad")
-                    .build())
-                .execute()
-                .returnResponse();
-    }
-
-    @When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" with an invalid authentication token$")
-    public void getDownloadWithUnknownToken(String attachmentId) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        response = Request.Get(
-                baseUri(mainStepdefs.jmapServer)
-                    .setPath("/download/" + blobId)
-                    .addParameter("access_token", INVALID_ATTACHMENT_TOKEN)
-                    .build())
-                .execute()
-                .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" downloads \"([^\"]*)\" without blobId parameter$")
-    public void getDownloadWithoutBlobId(String username, String attachmentId) throws Throwable {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-
-        URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/");
-        trustForBlobId(blobId, username);
-        AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
-        uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
-        response = Request.Get(uriBuilder.build())
-            .execute()
-            .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" downloads \"([^\"]*)\" with wrong blobId$")
-    public void getDownloadWithWrongBlobId(String username, String attachmentId) throws Throwable {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-
-        URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/badbadbadbadbadbadbadbadbadbadbadbadbadb");
-        trustForBlobId(blobId, username);
-        AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
-        uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
-        response = Request.Get(uriBuilder.build())
-            .execute()
-            .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" asks for a token for attachment \"([^\"]*)\"$")
-    public void postDownload(String username, String attachmentId) throws Throwable {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        response = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
-                .addHeader("Authorization", accessToken.asString())
-                .execute()
-                .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" downloads \"([^\"]*)\" with \"([^\"]*)\" name$")
-    public void downloadsWithName(String username, String attachmentId, String name) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId + "/" + name);
-        response = authenticatedDownloadRequest(uriBuilder, blobId, username)
-                .execute()
-                .returnResponse();
-    }
-
-    @When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" with an expired token$")
-    public void getDownloadWithExpiredToken(String attachmentId) throws Exception {
-        String blobId = blobIdByAttachmentId.get(attachmentId);
-        response = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId)
-                .addParameter("access_token", EXPIRED_ATTACHMENT_TOKEN)
-                .build())
-            .execute()
-            .returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" delete mailbox \"([^\"]*)\"$")
-    public void deleteMailboxButNotAttachment(String username, String mailboxName) {
-        mainStepdefs.mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, username, mailboxName);
-    }
-
-    @Then("^the user should be authorized$")
-    public void httpStatusDifferentFromUnauthorized() {
-        assertThat(response.getStatusLine().getStatusCode()).isIn(200, 404);
-    }
-
-    @Then("^\"([^\"]*)\" be authorized$")
-    public void httpStatusDifferentFromUnauthorized(String username) {
-        userStepdefs.execWithUser(username, this::httpStatusDifferentFromUnauthorized);
-    }
-
-    @Then("^the user should not be authorized$")
-    public void httpUnauthorizedStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(401);
-    }
-
-    @Then("^\"([^\"]*)\" should not be authorized$")
-    public void httpUnauthorizedStatus(String username) {
-        userStepdefs.execWithUser(username, this::httpUnauthorizedStatus);
-    }
-
-    @Then("^the user should receive a bad request response$")
-    public void httpBadRequestStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(400);
-    }
-
-    @Then("^\"([^\"]*)\" should receive a bad request response$")
-    public void httpBadRequestStatus(String username) {
-        userStepdefs.execWithUser(username, this::httpBadRequestStatus);
-    }
-
-    @Then("^(?:he|she|the user) can read that blob")
-    public void httpOkStatusAndExpectedContent() throws IOException {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)).isNotEmpty();
-    }
-
-    @Then("^the user should receive a not found response$")
-    public void httpNotFoundStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(404);
-    }
-
-    @Then("^\"([^\"]*)\" should receive a not found response$")
-    public void httpNotFoundStatus(String username) {
-        userStepdefs.execWithUser(username, this::httpNotFoundStatus);
-    }
-
-    @Then("^the user should receive an attachment access token$")
-    public void accessTokenResponse() throws Throwable {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(response.getHeaders("Content-Type")).extracting(Header::getValue).containsExactly("text/plain");
-        assertThat(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)).isNotEmpty();
-    }
-
-    @Then("^\"([^\"]*)\" should receive an attachment access token$")
-    public void accessTokenResponse(String username) {
-        userStepdefs.execWithUser(username, this::accessTokenResponse);
-    }
-
-    @Then("^the attachment is named \"([^\"]*)\"$")
-    public void assertContentDisposition(String name) {
-        if (!CharMatcher.ascii().matchesAllOf(name)) {
-            assertEncodedFilenameMatches(name);
-        } else {
-            assertThat(response.getFirstHeader("Content-Disposition").getValue()).isEqualTo("attachment; filename=\"" + name + "\"");
-        }
-    }
-
-    @Then("^the blob size is (\\d+)$")
-    public void assertContentLength(int size) {
-        assertThat(response.getFirstHeader("Content-Length").getValue()).isEqualTo(String.valueOf(size));
-    }
-
-    @Then("^CORS headers are positioned$")
-    public void assertCorsHeader() {
-        assertThat(response.getFirstHeader("Access-Control-Allow-Origin").getValue()).isEqualTo("*");
-        assertThat(response.getFirstHeader("Access-Control-Allow-Methods").getValue()).isEqualTo("GET, POST, DELETE, PUT");
-        assertThat(response.getFirstHeader("Access-Control-Allow-Headers").getValue()).isEqualTo("Content-Type, Authorization, Accept");
-        assertThat(response.getFirstHeader("Access-Control-Max-Age").getValue()).isEqualTo("86400");
-    }
-
-    @Then("^the Content-Type is \"([^\"]*)\"$")
-    public void assertContentType(String contentType) {
-        assertThat(response.getFirstHeader("Content-Type").getValue()).isEqualTo(contentType);
-    }
-
-    private void assertEncodedFilenameMatches(String name) {
-        String contentDispositionHeader = response.getHeaders("Content-Disposition")[0].toString();
-        assertThat(contentDispositionHeader).startsWith(UTF8_CONTENT_DIPOSITION_START);
-
-        String expectedFilename = decode(extractFilename(contentDispositionHeader));
-        assertThat(name).isEqualTo(expectedFilename);
-    }
-
-    private String extractFilename(String contentDispositionHeader) {
-        return contentDispositionHeader.substring(UTF8_CONTENT_DIPOSITION_START.length(),
-                contentDispositionHeader.length() - 1);
-    }
-
-    private String decode(String name) {
-        return DecoderUtil.decodeEncodedWords(name, StandardCharsets.UTF_8);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMailboxesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
deleted file mode 100644
index b1993c36eed..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static com.jayway.jsonpath.Criteria.where;
-import static com.jayway.jsonpath.Filter.filter;
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.inject.Inject;
-
-import org.apache.james.core.Username;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class GetMailboxesMethodStepdefs {
-
-    private final UserStepdefs userStepdefs;
-    private final HttpClient httpClient;
-    private final MainStepdefs mainStepdefs;
-
-    @Inject
-    private GetMailboxesMethodStepdefs(UserStepdefs userStepdefs, HttpClient httpClient, MainStepdefs mainStepdefs) {
-        this.userStepdefs = userStepdefs;
-        this.httpClient = httpClient;
-        this.mainStepdefs = mainStepdefs;
-    }
-
-    @Given("^the user has a mailbox \"([^\"]*)\"$")
-    public void hasMailbox(String mailbox) {
-        mainStepdefs.mailboxProbe.createMailbox(MailboxPath.forUser(
-            Username.of(userStepdefs.getConnectedUser()), mailbox));
-    }
-
-    @When("^\"([^\"]*)\" lists mailboxes$")
-    public void getMailboxes(String user) {
-        userStepdefs.execWithUser(user, 
-                () -> httpClient.post("[[\"getMailboxes\", {}, \"#0\"]]"));
-    }
-
-    @Then("^a mailboxes answer is returned without error$")
-    public void assertGetMailboxesOkStatus() {
-        assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(httpClient.jsonPath.<String>read(NAME)).isEqualTo("mailboxes");
-    }
-
-    @Then("^the list should contain (\\d+) (?:mailbox|mailboxes)$")
-    public void assertNumberOfMailboxes(int numberOfMailboxes) {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list")).hasSize(numberOfMailboxes);
-    }
-
-    @Then("^the mailboxes should contain \"([^\"]*)\" in \"([^\"]*)\" namespace$")
-    public void assertMailboxesNames(String mailboxName, String namespace) throws Exception {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[*].name")).contains(mailboxName);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].namespace.type",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(namespace);
-    }
-
-    @Then("^the mailboxes should not contain \"([^\"]*)\" in \"([^\"]*)\" namespace$")
-    public void assertNotMailboxesNames(String mailboxName, String namespace) throws Exception {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].namespace.type",
-            filter(where("name").is(mailboxName))))
-            .doesNotContain(namespace);
-    }
-
-    @Then("^the mailboxes should contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with parent mailbox \"([^\"]*)\" of user \"([^\"]*)\"$")
-    public void assertMailboxesNames(String mailboxName, String namespace, String parentName, String parentOwner) throws Exception {
-        MailboxId parentMailbox = mainStepdefs.mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, parentOwner, parentName);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[*].name")).contains(mailboxName);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].namespace.type",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(namespace);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].parentId",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(parentMailbox.serialize());
-    }
-
-    @Then("^the mailboxes should not contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with parent mailbox \"([^\"]*)\" of user \"([^\"]*)\"$")
-    public void assertNotMailboxesNames(String mailboxName, String namespace, String parentName, String parentOwner) throws Exception {
-        MailboxId parentMailbox = mainStepdefs.mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, parentOwner, parentName);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].parentId",
-            filter(where("name").is(mailboxName).and("namespace.type").is(namespace))))
-            .doesNotContain(parentMailbox.serialize());
-    }
-
-    @Then("^the mailboxes should contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with no parent mailbox$")
-    public void assertMailboxesNamesNoParent(String mailboxName, String namespace) throws Exception {
-        ArrayList<Object> noParent = new ArrayList<>();
-        noParent.add(null); // Trick to allow collection with null element matching
-
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[*].name")).contains(mailboxName);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].namespace.type",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(namespace);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].parentId",
-                filter(where("name").is(mailboxName))))
-            .isEqualTo(noParent);
-    }
-
-    @Then("^the mailboxes should not contain \"([^\"]*)\"$")
-    public void assertNoMailboxesNames(String mailboxName) throws Exception {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[*].name")).doesNotContain(mailboxName);
-    }
-
-    @Then("^the mailbox \"([^\"]*)\" has (\\d+) (?:messages|message)$")
-    public void assertNumberOfMessages(String mailboxName, int numberOfMessages) throws Exception {
-        assertThat(httpClient.jsonPath.<List<Integer>>read(ARGUMENTS + ".list[?].totalMessages",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(numberOfMessages);
-    }
-
-    @Then("^the mailbox \"([^\"]*)\" has (\\d+) unseen (?:messages|message)$")
-    public void assertNumberOfUnseenMessages(String mailboxName, int numberOfUnseenMessages) throws Exception {
-        assertThat(httpClient.jsonPath.<List<Integer>>read(ARGUMENTS + ".list[?].unreadMessages",
-                filter(where("name").is(mailboxName))))
-            .containsOnly(numberOfUnseenMessages);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessageListMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessageListMethodStepdefs.java
deleted file mode 100644
index b9a906e00ba..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessageListMethodStepdefs.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.base.Splitter;
-import jakarta.inject.Inject;
-
-import org.apache.james.mailbox.model.MessageId;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class GetMessageListMethodStepdefs {
-
-    private final MainStepdefs mainStepdefs;
-    private final HttpClient httpClient;
-    private final MessageIdStepdefs messageIdStepdefs;
-    private final UserStepdefs userStepdefs;
-
-    @Inject
-    private GetMessageListMethodStepdefs(MainStepdefs mainStepdefs, HttpClient httpClient, MessageIdStepdefs messageIdStepdefs, UserStepdefs userStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.httpClient = httpClient;
-        this.messageIdStepdefs = messageIdStepdefs;
-        this.userStepdefs = userStepdefs;
-    }
-
-    @When("^\"([^\"]*)\" asks for message list in mailboxes \"([^\"]*)\" with flag \"([^\"]*)\"$")
-    public void getMessageListWithFlag(String username, String mailboxes, String flag) throws Exception {
-        httpClient.post(String.format(
-                "[[\"getMessageList\", {\"filter\":{" +
-                "    \"inMailboxes\":[\"%s\"]," +
-                "    \"hasKeyword\":\"%s\"" +
-                "}}, \"#0\"]]",
-            mainStepdefs.getMailboxIds(username, Splitter.on(',').trimResults().splitToList(mailboxes)),
-            flag));
-    }
-
-    @When("^\"([^\"]*)\" asks for message list in (?:mailboxes|mailbox) \"([^\"]*)\"$")
-    public void getMessageList(String username, String mailboxes) throws Exception {
-        getMessageListFromMailboxIds(mainStepdefs.getMailboxIds(username, Splitter.on(',').trimResults().splitToList(mailboxes)));
-    }
-
-    @When("^\"([^\"]*)\" asks for message list in delegated (?:mailboxes|mailbox) \"([^\"]*)\" from \"([^\"]*)\"$")
-    public void getMessageListFromDelegated(String sharee, String mailboxes, String sharer) throws Exception {
-        userStepdefs.execWithUser(sharee, () ->
-            getMessageListFromMailboxIds(mainStepdefs.getMailboxIds(sharer, Splitter.on(',').trimResults().splitToList(mailboxes))));
-    }
-
-    private void getMessageListFromMailboxIds(String mailboxIds) throws Exception {
-        httpClient.post(String.format(
-            "[[\"getMessageList\", {\"filter\":{" +
-                "    \"inMailboxes\":[\"%s\"]" +
-                "}}, \"#0\"]]",
-            mailboxIds));
-    }
-
-    @When("^\"([^\"]*)\" asks for message list in mailbox \"([^\"]*)\" with flag \"([^\"]*)\"$")
-    public void getMessageList(String username, String mailbox, String flag) throws Exception {
-
-        httpClient.post(String.format(
-                "[[\"getMessageList\", {\"filter\":{" +
-                "    \"inMailboxes\":[\"%s\"]," +
-                "    \"hasKeyword\":\"%s\"" +
-                "}}, \"#0\"]]",
-            mainStepdefs
-                .getMailboxId(username, mailbox)
-                .serialize(),
-            flag));
-    }
-
-    @When("^the user asks for message list with flag \"([^\"]*)\"$")
-    public void getMessageList(String flag) throws Exception {
-        httpClient.post(String.format(
-            "[[\"getMessageList\", {\"filter\":{" +
-                "    \"hasKeyword\":\"%s\"" +
-                "}}, \"#0\"]]",
-            flag));
-    }
-
-    @Then("^the message list is empty$")
-    public void assertEmpty() {
-        calmlyAwait
-            .atMost(30, TimeUnit.SECONDS)
-            .until(
-                () -> httpClient.response.getStatusLine().getStatusCode() == 200
-                    && httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".messageIds").isEmpty());
-    }
-
-    @Then("^the message list has size (\\d+)")
-    public void assertSize(int size) {
-        calmlyAwait
-            .atMost(30, TimeUnit.SECONDS)
-            .until(
-                () -> httpClient.response.getStatusLine().getStatusCode() == 200
-                    && httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".messageIds").size() == size);
-    }
-
-    @Then("^the message list contains \"([^\"]*)\"")
-    public void assertContains(String message) {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        calmlyAwait
-            .atMost(30, TimeUnit.SECONDS)
-            .until(
-                () -> httpClient.response.getStatusLine().getStatusCode() == 200
-                    && httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".messageIds").contains(messageId.serialize()));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java
deleted file mode 100644
index 726dce955c5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ /dev/null
@@ -1,770 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.apache.james.mailbox.model.MailboxConstants.INBOX;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import io.cucumber.datatable.DataTable;
-import jakarta.inject.Inject;
-import jakarta.mail.Flags;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.james.core.Username;
-import org.apache.james.jmap.JmapGuiceProbe;
-import org.apache.james.jmap.draft.methods.integration.cucumber.util.TableRow;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.modules.protocols.SmtpGuiceProbe;
-import org.apache.james.util.ClassLoaderUtils;
-import org.apache.james.utils.SMTPMessageSender;
-
-import com.github.fge.lambdas.Throwing;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-import net.minidev.json.JSONArray;
-
-@ScenarioScoped
-public class GetMessagesMethodStepdefs {
-
-    private static final Optional<Map<String, String>> NO_HEADERS = Optional.empty();
-    private static final String FIRST_MESSAGE = ARGUMENTS + ".list[0]";
-    private static final String ATTACHMENTS = FIRST_MESSAGE + ".attachments";
-    private static final String FIRST_ATTACHMENT = ATTACHMENTS + "[0]";
-    private static final String SECOND_ATTACHMENT = ATTACHMENTS + "[1]";
-    private static final int PREVIEW_LENGTH = 256;
-
-
-    private final MainStepdefs mainStepdefs;
-    private final UserStepdefs userStepdefs;
-    private final HttpClient httpClient;
-    private final MessageIdStepdefs messageIdStepdefs;
-
-    private List<MessageId> requestedMessageIds;
-
-    @Inject
-    private GetMessagesMethodStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs,
-                                      HttpClient httpClient, MessageIdStepdefs messageIdStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.userStepdefs = userStepdefs;
-        this.httpClient = httpClient;
-        this.messageIdStepdefs = messageIdStepdefs;
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" and \"([^\"]*)\" mailboxes with subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessageInTwoMailboxes(String messageName, String mailbox1, String mailbox2, String subject, String content) throws Exception {
-        MessageId id = appendMessage(mailbox1, ContentType.noContentType(), subject, content, NO_HEADERS);
-
-        String user = userStepdefs.getConnectedUser();
-
-        MailboxId mailboxId1 = mainStepdefs.getMailboxId(user, mailbox1);
-        MailboxId mailboxId2 = mainStepdefs.getMailboxId(user, mailbox2);
-
-        mainStepdefs.jmapServer.getProbe(JmapGuiceProbe.class).setInMailboxes(id, Username.of(user), mailboxId1, mailboxId2);
-        messageIdStepdefs.addMessageId(messageName, id);
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" and \"([^\"]*)\" mailboxes with subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessageInTwoMailboxes(String username, String messageName, String mailbox1, String mailbox2, String subject, String content) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageInTwoMailboxes(messageName, mailbox1, mailbox2, subject, content));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessage(String messageName, String mailbox, String subject, String content) throws Exception {
-        MessageId id = appendMessage(mailbox, ContentType.noContentType(), subject, content, NO_HEADERS);
-        messageIdStepdefs.addMessageId(messageName, id);
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessage(String username, String messageName, String mailbox, String subject, String content) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessage(messageName, mailbox, subject, content));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with content-type \"([^\"]*)\" subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessageWithContentType(String username, String messageName, String mailbox, String contentType, String subject, String content) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithContentType(messageName, mailbox, contentType, subject, content));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with content-type \"([^\"]*)\" subject \"([^\"]*)\", content \"([^\"]*)\"$")
-    public void appendMessageWithContentType(String messageName, String mailbox, String contentType, String subject, String content) throws Throwable {
-        MessageId id = appendMessage(mailbox, ContentType.from(contentType), subject, content, NO_HEADERS);
-        messageIdStepdefs.addMessageId(messageName, id);
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with content-type \"([^\"]*)\" subject \"([^\"]*)\", content \"([^\"]*)\", headers$")
-    public void appendMessage(String username, String messageName, String mailbox, String contentType, String subject, String content, DataTable headers) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessage(messageName, mailbox, contentType, subject, content, headers));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with content-type \"([^\"]*)\" subject \"([^\"]*)\", content \"([^\"]*)\", headers$")
-    public void appendMessage(String messageName, String mailbox, String contentType, String subject, String content, DataTable headers) throws Exception {
-        MessageId id = appendMessage(mailbox, ContentType.from(contentType), subject, content, Optional.of(headers.asMap(String.class, String.class)));
-        messageIdStepdefs.addMessageId(messageName, id);
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with subject \"([^\"]*)\", content \"([^\"]*)\", headers$")
-    public void appendMessageWithHeader(String messageName, String mailbox, String subject, String content, DataTable headers) throws Exception {
-        MessageId id = appendMessage(mailbox, ContentType.noContentType(), subject, content, Optional.of(headers.asMap(String.class, String.class)));
-        messageIdStepdefs.addMessageId(messageName, id);
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with subject \"([^\"]*)\", content \"([^\"]*)\", headers$")
-    public void appendMessageWithHeader(String username, String messageName, String mailbox, String subject, String content, DataTable headers) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithHeader(messageName, mailbox, subject, content, headers));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox, composed of a multipart with inlined text part and inlined html part$")
-    public void appendMessageFromFileInlinedMultipart(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageFromFileInlinedMultipart(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox, composed of a multipart with inlined text part and inlined html part$")
-    public void appendMessageFromFileInlinedMultipart(String messageName, String mailbox) throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        MessageId id = mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(),
-            MailboxPath.forUser(Username.of(userStepdefs.getConnectedUser()), mailbox),
-            ClassLoader.getSystemResourceAsStream("eml/inlinedMultipart.eml"),
-            Date.from(dateTime.toInstant()), false, new Flags())
-            .getMessageId();
-        messageIdStepdefs.addMessageId(messageName, id);
-        mainStepdefs.awaitMethod.run();
-    }
-
-    private MessageId appendMessage(String mailbox, ContentType contentType, String subject, String content, Optional<Map<String, String>> headers) throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        try {
-            return mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(),
-                MailboxPath.forUser(Username.of(userStepdefs.getConnectedUser()), mailbox),
-                new ByteArrayInputStream(message(contentType, subject, content, headers).getBytes(StandardCharsets.UTF_8)),
-                Date.from(dateTime.toInstant()), false, new Flags()).getMessageId();
-        } finally {
-            mainStepdefs.awaitMethod.run();
-        }
-    }
-
-    private String message(ContentType contentType, String subject, String content, Optional<Map<String,String>> headers) {
-        return serialize(headers) + contentType.serializeToHeader() + "Subject: " + subject + "\r\n\r\n" + content;
-    }
-
-    private String serialize(Optional<Map<String,String>> headers) {
-        return headers
-            .map(Map::entrySet)
-            .map(entriesToString())
-            .orElse("");
-    }
-
-    private Function<Set<Entry<String, String>>, String> entriesToString() {
-        return entries -> entries.stream()
-            .map(entry -> entry.getKey() + ": " + entry.getValue())
-            .collect(Collectors.joining("\r\n", "", "\r\n"));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two attachments$")
-    public void appendHtmlMessageWithTwoAttachments(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/twoAttachments.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two attachments$")
-    public void appendHtmlMessageWithTwoAttachments(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendHtmlMessageWithTwoAttachments(messageName, mailbox));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two attachments in text$")
-    public void appendTextMessageWithTwoAttachments(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendTextMessageWithTwoAttachments(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two attachments in text$")
-    public void appendTextMessageWithTwoAttachments(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/twoAttachmentsTextPlain.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two same attachments in text$")
-    public void appendTextMessageWithTwoSameAttachments(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendTextMessageWithTwoAttachments(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with two same attachments in text$")
-    public void appendTextMessageWithTwoSameAttachments(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/twoSameAttachments.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a multipart message \"([^\"]*)\" in \"([^\"]*)\" mailbox$")
-    public void appendMultipartMessageWithOneAttachments(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMultipartMessageWithOneAttachments(messageName, mailbox));
-    }
-
-    @Given("^the user has a multipart message \"([^\"]*)\" in \"([^\"]*)\" mailbox$")
-    public void appendMultipartMessageWithOneAttachments(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/htmlAndTextMultipartWithOneAttachment.eml");
-    }
-
-    @Given("\"([^\"]*)\" has a multipart/related message \"([^\"]*)\" in \"([^\"]*)\" mailbox$")
-    public void appendMultipartRelated(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMultipartRelated(messageName, mailbox));
-    }
-
-    @Given("^the user has a multipart/related message \"([^\"]*)\" in \"([^\"]*)\" mailbox$")
-    public void appendMultipartRelated(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/multipartRelated.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox beginning by a long line$")
-    public void appendMessageBeginningByALongLine(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageBeginningByALongLine(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox beginning by a long line$")
-    public void appendMessageBeginningByALongLine(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/longLine.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with plain/text inline attachment$")
-    public void appendMessageWithPlainTextInlineAttachment(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithPlainTextInlineAttachment(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with plain/text inline attachment$")
-    public void appendMessageWithPlainTextInlineAttachment(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/embeddedMultipartWithInlineTextAttachment.eml");
-    }
-
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with text in main multipart and html in inner multipart$")
-    public void appendMessageWithTextInMainMultipartAndHtmlInInnerMultipart(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithTextInMainMultipartAndHtmlInInnerMultipart(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with text in main multipart and html in inner multipart$")
-    public void appendMessageWithTextInMainMultipartAndHtmlInInnerMultipart(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/textInMainMultipartHtmlInInnerMultipart.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with html body and no text body$")
-    public void appendMessageWithNoTextButHtml(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithNoTextButHtml(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with html body and no text body$")
-    public void appendMessageWithNoTextButHtml(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/noTextBodyButHtmlBody.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with inline attachment but no CID$")
-    public void appendMessageWithInlineAttachmentButNoCid(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithInlineAttachmentButNoCid(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with inline attachment but no CID$")
-    public void appendMessageWithInlineAttachmentButNoCid(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/mailWithInlinedAttachmentButNoCid.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with inline attachment and blank CID$")
-    public void appendMessageWithInlineAttachmentAndBlankCid(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithInlineAttachmentAndBlankCid(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with inline attachment and blank CID$")
-    public void appendMessageWithInlineAttachmentAndBlankCid(String messageName, String mailbox) throws Throwable {
-        appendMessage(messageName, mailbox, "eml/mailWithInlinedAttachmentAndBlankCid.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with HTML body with many empty tags$")
-    public void appendMessageWithNoPreview(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithNoPreview(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with HTML body with many empty tags$")
-    public void appendMessageWithNoPreview(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/htmlBodyWithManyEmptyTags.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with multiple same inlined attachments \"(?:[^\"]*)\"$")
-    public void appendMessageWithSameInlinedAttachmentsToMailbox(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithSameInlinedAttachmentsToMailbox(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with multiple same inlined attachments \"(?:[^\"]*)\"$")
-    public void appendMessageWithSameInlinedAttachmentsToMailbox(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/sameInlinedImages.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with inlined attachments without content disposition$")
-    public void appendMessageWithInlinedAttachmentButNoContentDisposition(String username, String messageName, String mailbox) throws Exception {
-        userStepdefs.execWithUser(username, () -> appendMessage(messageName, mailbox, "eml/inlinedWithoutContentDisposition.eml"));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with inlined image without content disposition$")
-    public void appendMessageWithInlinedImageButNoContentDisposition(String username, String messageName, String mailbox) throws Exception {
-        userStepdefs.execWithUser(username, () -> appendMessage(messageName, mailbox, "eml/oneInlinedImageWithoutContentDisposition.eml"));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with inlined image without content ID$")
-    public void appendMessageWithInlinedImageButNoContentID(String username, String messageName, String mailbox) throws Exception {
-        userStepdefs.execWithUser(username, () -> appendMessage(messageName, mailbox, "eml/inlinedWithoutContentID.eml"));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with specific charset$")
-    public void appendMessageWithSpecificCharset(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithSpecificCharset(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with specific charset$")
-    public void appendMessageWithSpecificCharset(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/windows1252charset.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with long and complicated HTML content$")
-    public void appendMessageWithSpecialCase(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithSpecialCase(messageName, mailbox));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox with long and complicated HTML content$")
-    public void appendMessageWithSpecialCase(String messageName, String mailbox) throws Exception {
-        appendMessage(messageName, mailbox, "eml/htmlWithLongAndComplicatedContent.eml");
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with flags \"([^\"]*)\"$")
-    public void appendMessageWithFlags(String username, String messageName, String mailbox, String flagList) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithFlags(messageName, mailbox, flagList));
-    }
-
-    @Given("^\"([^\"]*)\" has a message \"([^\"]*)\" in \"([^\"]*)\" mailbox$")
-    public void appendSimpleMessage(String username, String messageName, String mailbox) throws Throwable {
-        userStepdefs.execWithUser(username, () -> appendMessageWithFlags(messageName, mailbox, ""));
-    }
-
-    @Given("^the user has a message \"([^\"]*)\" in the \"([^\"]*)\" mailbox with flags \"([^\"]*)\"$")
-    public void appendMessageWithFlags(String messageName, String mailbox, String flagList) throws Exception {
-        appendMessage(messageName, mailbox, StringListToFlags.fromFlagList(Splitter.on(',').trimResults().omitEmptyStrings().splitToList(flagList)));
-    }
-
-    @Given("^\"([^\"]*)\" receives a SMTP message specified in file \"([^\"]*)\" as message \"([^\"]*)\"$")
-    public void smtpSend(String user, String fileName, String messageName) throws Exception {
-        MailboxId mailboxId = mainStepdefs.mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, user, INBOX);
-        SMTPMessageSender smtpMessageSender = new SMTPMessageSender("domain.com");
-        smtpMessageSender
-            .connect("127.0.0.1", mainStepdefs.jmapServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
-            .sendMessageWithHeaders("from@domain.com", user,
-                ClassLoaderUtils.getSystemResourceAsString(fileName));
-        smtpMessageSender.close();
-
-        calmlyAwait.until(() -> !retrieveIds(user, mailboxId).isEmpty());
-        List<String> ids = retrieveIds(user, mailboxId);
-        messageIdStepdefs.addMessageId(messageName, mainStepdefs.messageIdFactory.fromString(ids.get(0)));
-    }
-
-    public List<String> retrieveIds(String user, MailboxId mailboxId) {
-        userStepdefs.execWithUser(user, () -> httpClient.post("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId.serialize() + "\"]}}, \"#0\"]]"));
-        return httpClient.jsonPath.read(ARGUMENTS + ".messageIds.[*]");
-    }
-
-    private void appendMessage(String messageName, String mailbox, Flags flags) throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-        boolean isRecent = flags.contains(Flags.Flag.RECENT);
-        MessageId id = mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(),
-            MailboxPath.forUser(Username.of(userStepdefs.getConnectedUser()), mailbox),
-            new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
-            Date.from(dateTime.toInstant()), isRecent, flags)
-            .getMessageId();
-        messageIdStepdefs.addMessageId(messageName, id);
-        mainStepdefs.awaitMethod.run();
-    }
-
-    private void appendMessage(String messageName, String mailbox, String emlFileName) throws Exception {
-        ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
-
-        MessageId id = mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(),
-            MailboxPath.forUser(Username.of(userStepdefs.getConnectedUser()), mailbox),
-                ClassLoader.getSystemResourceAsStream(emlFileName),
-                Date.from(dateTime.toInstant()), false, new Flags())
-                    .getMessageId();
-
-        messageIdStepdefs.addMessageId(messageName, id);
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @When("^\"([^\"]*)\" ask for messages using its accountId$")
-    public void postWithAccountId(String user) throws Throwable {
-        userStepdefs.execWithUser(user, this::postWithAccountId);
-    }
-
-    @When("^\the user ask for messages using its accountId$")
-    public void postWithAccountId() throws Exception {
-        httpClient.post("[[\"getMessages\", {\"accountId\": \"1\"}, \"#0\"]]");
-    }
-
-    @When("^\"([^\"]*)\" ask for messages using unknown arguments$")
-    public void postWithUnknownArguments(String user) throws Throwable {
-        userStepdefs.execWithUser(user, this::postWithUnknownArguments);
-    }
-
-    @When("^the user ask for messages using unknown arguments$")
-    public void postWithUnknownArguments() throws Exception {
-        httpClient.post("[[\"getMessages\", {\"WAT\": true}, \"#0\"]]");
-    }
-
-    @When("^the user ask for messages using invalid argument$")
-    public void postWithInvalidArguments() throws Exception {
-        httpClient.post("[[\"getMessages\", {\"ids\": null}, \"#0\"]]");
-    }
-
-    @When("^\"([^\"]*)\" ask for messages using invalid argument$")
-    public void postWithInvalidArguments(String user) throws Throwable {
-        userStepdefs.execWithUser(user, this::postWithInvalidArguments);
-    }
-
-    @When("^the user ask for messages$")
-    public void post() throws Exception {
-        httpClient.post("[[\"getMessages\", {\"ids\": []}, \"#0\"]]");
-    }
-
-    @When("^\"(.*?)\" ask for messages$")
-    public void postWithGivenUser(String username) throws Throwable {
-        userStepdefs.execWithUser(username, this::post);
-    }
-
-    @When("^the user ask for messages \"(.*?)\"$")
-    public void postWithAListOfIds(String id) throws Exception {
-        requestedMessageIds = ImmutableList.of(messageIdStepdefs.getMessageId(id));
-        askMessages(requestedMessageIds);
-    }
-
-    @When("^the user ask for message \"(.*?)\"$")
-    public void postWithAnId(String ids) throws Exception {
-        requestedMessageIds = Splitter.on(',').trimResults().splitToStream(ids)
-            .map(messageIdStepdefs::getMessageId)
-            .collect(ImmutableList.toImmutableList());
-        askMessages(requestedMessageIds);
-    }
-
-    @When("^\"(.*?)\" ask for messages \"(.*?)\"$")
-    public void postWithAListOfIds(String user, String ids) {
-        userStepdefs.execWithUser(user, () -> postWithAListOfIds(ids));
-    }
-
-    @When("^\"(.*?)\" ask for message \"(.*?)\"$")
-    public void postWithAnId(String user, String id) {
-        userStepdefs.execWithUser(user, () -> postWithAListOfIds(id));
-    }
-
-    @When("^\"(.*?)\" ask for an unknown message$")
-    public void requestUnknownMessage(String user) throws Throwable {
-        userStepdefs.execWithUser(user, this::requestUnknownMessage);
-    }
-
-    @When("^the user ask for an unknown message$")
-    public void requestUnknownMessage() throws Exception {
-        askMessages(ImmutableList.of(mainStepdefs.messageIdFactory.generate()));
-    }
-
-    private void askMessages(List<MessageId> messageIds) throws Exception {
-        requestedMessageIds = messageIds;
-        String serializedIds = requestedMessageIds.stream()
-            .map(MessageId::serialize)
-            .map(toJsonString())
-            .collect(Collectors.joining(",", "[", "]"));
-        httpClient.post("[[\"getMessages\", {\"ids\": " + serializedIds + "}, \"#0\"]]");
-    }
-
-    private Function<? super String, ? extends String> toJsonString() {
-        return string -> "\"" + string + "\"";
-    }
-
-    @When("^\"(.*?)\" is getting message \"(.*?)\" with properties \"(.*?)\"$")
-    public void postWithParameters(String username, String id, String properties) throws Throwable {
-        userStepdefs.execWithUser(username, () -> postWithParameters(id, properties));
-    }
-
-    @When("^the user is getting messages \"(.*?)\" with properties \"(.*?)\"$")
-    public void postWithParameters(String ids, String properties) throws Exception {
-        requestedMessageIds = Splitter.on(',').trimResults().splitToStream(ids)
-            .map(messageIdStepdefs::getMessageId)
-            .collect(ImmutableList.toImmutableList());
-
-        String serializedIds = requestedMessageIds.stream()
-            .map(MessageId::serialize)
-            .map(toJsonString())
-            .collect(Collectors.joining(",", "[", "]"));
-
-        String serializedProperties = Splitter.on(',').trimResults().splitToStream(properties)
-            .map(toJsonString())
-            .collect(Collectors.joining(",", "[", "]"));
-
-        httpClient.post("[[\"getMessages\", {\"ids\": " + serializedIds + ", \"properties\": " + serializedProperties + "}, \"#0\"]]");
-    }
-
-    @Then("^an error \"([^\"]*)\" with type \"([^\"]*)\" is returned$")
-    public void error(String description, String type) {
-        assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(httpClient.jsonPath.<String>read(NAME)).isEqualTo("error");
-        assertThat(httpClient.jsonPath.<String>read(ARGUMENTS + ".type")).isEqualTo(type);
-        assertThat(httpClient.jsonPath.<String>read(ARGUMENTS + ".description")).isEqualTo(description);
-    }
-
-    @Then("^an error of type \"([^\"]*)\" is returned$")
-    public void errorType(String type) {
-        assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(httpClient.jsonPath.<String>read(NAME)).isEqualTo("error");
-        assertThat(httpClient.jsonPath.<String>read(ARGUMENTS + ".type")).isEqualTo(type);
-    }
-
-    @Then("^no error is returned$")
-    public void noError() {
-        assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(httpClient.jsonPath.<String>read(NAME)).isEqualTo("messages");
-    }
-
-    @Then("^the list of unknown messages is empty$")
-    public void assertNotFoundIsEmpty() {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".notFound")).isEmpty();
-    }
-
-    @Then("^the list of messages is empty$")
-    public void assertListIsEmpty() {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list")).isEmpty();
-    }
-
-    @Then("^the notFound list should contain \"([^\"]*)\"$")
-    public void assertNotFoundListContains(String id) {
-        MessageId messageId = messageIdStepdefs.getMessageId(id);
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".notFound")).contains(messageId.serialize());
-    }
-
-    @Then("^the notFound list should contain the requested message id$")
-    public void assertNotFoundListContainsRequestedMessages() {
-        ImmutableList<String> elements = requestedMessageIds.stream().map(MessageId::serialize).collect(ImmutableList.toImmutableList());
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".notFound"))
-            .containsExactlyElementsOf(elements);
-    }
-
-
-    @Then("^the list should contain (\\d+) message$")
-    public void assertListContains(int numberOfMessages) {
-        assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list")).hasSize(numberOfMessages);
-    }
-
-    @Then("^the id of the message is \"([^\"]*)\"$")
-    public void assertIdOfTheFirstMessage(String messageName) {
-        MessageId id = messageIdStepdefs.getMessageId(messageName);
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".id")).isEqualTo(id.serialize());
-    }
-
-    @Then("^the message is in \"([^\"]*)\" mailboxes")
-    public void assertMailboxNamesOfTheFirstMessage(String mailboxNames) {
-        List<String> mailboxIds = mainStepdefs.getMailboxIdsList(userStepdefs.getConnectedUser(),
-            Splitter.on(",").splitToList(mailboxNames));
-
-        assertThat(httpClient.jsonPath.<JSONArray>read(FIRST_MESSAGE + ".mailboxIds"))
-            .containsExactlyInAnyOrder(mailboxIds.toArray());
-    }
-
-    @Then("^\"([^\"]*)\" should see message \"([^\"]*)\" in mailboxes:$")
-    public void assertMailboxesOfMessage(String user, String messageId, DataTable userMailboxes) throws Exception {
-        userStepdefs.execWithUser(user, () -> postWithAListOfIds(messageId));
-
-        List<String> mailboxIds = userMailboxes.asMap(String.class, String.class).entrySet().stream()
-            .map(Throwing.function(userMailbox ->
-                mainStepdefs
-                    .getMailboxId(userMailbox.getKey(), userMailbox.getValue())
-                    .serialize()))
-            .distinct()
-            .collect(ImmutableList.toImmutableList());
-
-        assertThat(httpClient.jsonPath.<JSONArray>read(FIRST_MESSAGE + ".mailboxIds"))
-            .containsExactlyInAnyOrder(mailboxIds.toArray());
-    }
-
-    @Then("^the threadId of the message is \"([^\"]*)\"$")
-    public void assertThreadIdOfTheFirstMessage(String threadId) {
-        MessageId id = messageIdStepdefs.getMessageId(threadId);
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".threadId")).isEqualTo(id.serialize());
-    }
-
-    @Then("^the subject of the message is \"([^\"]*)\"$")
-    public void assertSubjectOfTheFirstMessage(String subject) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".subject")).isEqualTo(subject);
-    }
-
-    @Then("^the textBody of the message is \"([^\"]*)\"$")
-    public void assertTextBodyOfTheFirstMessage(String textBody) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".textBody")).isEqualTo(StringEscapeUtils.unescapeJava(textBody));
-    }
-
-    @Then("^the htmlBody of the message is \"([^\"]*)\"$")
-    public void assertHtmlBodyOfTheFirstMessage(String htmlBody) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".htmlBody")).isEqualTo(StringEscapeUtils.unescapeJava(htmlBody));
-    }
-
-    @Then("^the isUnread of the message is \"([^\"]*)\"$")
-    public void assertIsUnreadOfTheFirstMessage(String isUnread) {
-        assertThat(httpClient.jsonPath.<Boolean>read(FIRST_MESSAGE + ".isUnread")).isEqualTo(Boolean.valueOf(isUnread));
-    }
-
-    @Then("^the preview of the message is \"([^\"]*)\"$")
-    public void assertPreviewOfTheFirstMessage(String preview) {
-        String actual = httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".preview").replace("\n", " ");
-        assertThat(actual).isEqualToIgnoringWhitespace(StringEscapeUtils.unescapeJava(preview));
-    }
-
-    @Then("^the preview of the message is not empty$")
-    public void assertPreviewOfTheFirstMessageIsNotEmpty() {
-        String actual = httpClient.jsonPath.read(FIRST_MESSAGE + ".preview");
-        assertThat(actual).isNotEmpty();
-    }
-
-    @Then("^the preview should not contain consecutive spaces or blank characters$")
-    public void assertPreviewShouldBeNormalized() {
-        String actual = httpClient.jsonPath.read(FIRST_MESSAGE + ".preview");
-        assertThat(actual).hasSize(PREVIEW_LENGTH)
-            .doesNotMatch("  ")
-            .doesNotContain(StringUtils.CR)
-            .doesNotContain(StringUtils.LF);
-    }
-
-    @Then("^the headers of the message contains:$")
-    public void assertHeadersOfTheFirstMessage(DataTable headers) {
-        assertThat(httpClient.jsonPath.<Map<String, String>>read(FIRST_MESSAGE + ".headers")).containsAllEntriesOf(headers.asMap(String.class, String.class));
-    }
-
-    @Then("^the date of the message is \"([^\"]*)\"$")
-    public void assertDateOfTheFirstMessage(String date) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".date")).isEqualTo(date);
-    }
-
-    @Then("^the hasAttachment of the message is \"([^\"]*)\"$")
-    public void assertHasAttachmentOfTheFirstMessage(String hasAttachment) {
-        assertThat(httpClient.jsonPath.<Boolean>read(FIRST_MESSAGE + ".hasAttachment")).isEqualTo(Boolean.valueOf(hasAttachment));
-    }
-
-    @Then("^the isForwarded property of the message is \"([^\"]*)\"$")
-    public void assertIsForwardedOfTheFirstMessage(String isForwarded) {
-        assertThat(httpClient.jsonPath.<Boolean>read(FIRST_MESSAGE + ".isForwarded")).isEqualTo(Boolean.valueOf(isForwarded));
-    }
-
-    @Then("^the list of attachments of the message is empty$")
-    public void assertAttachmentsOfTheFirstMessageIsEmpty() {
-        assertThat(httpClient.jsonPath.<List<Object>>read(ATTACHMENTS)).isEmpty();
-    }
-
-    @Then("^the property \"([^\"]*)\" of the message is null$")
-    public void assertPropertyIsNull(String property) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_MESSAGE + "." + property + ".date")).isNull();
-    }
-
-    @Then("^the list of attachments of the message contains (\\d+) attachments?$")
-    public void assertAttachmentsHasSize(int numberOfAttachments) {
-        assertThat(httpClient.jsonPath.<List<Object>>read(ATTACHMENTS)).hasSize(numberOfAttachments);
-    }
-
-    @Then("^the list of attachments of the message contains only one attachment with cid \"([^\"]*)\"?$")
-    public void assertAttachmentsAndItsCid(String cid) {
-        assertThat(httpClient.jsonPath.<String>read(FIRST_ATTACHMENT + ".cid")).isEqualTo(cid);
-    }
-
-    @Then("^the first attachment is:$")
-    public void assertFirstAttachment(DataTable attachmentProperties) {
-        assertAttachment(FIRST_ATTACHMENT, attachmentProperties);
-    }
-
-    @Then("^the second attachment is:$")
-    public void assertSecondAttachment(DataTable attachmentProperties) {
-        assertAttachment(SECOND_ATTACHMENT, attachmentProperties);
-    }
-
-    @Then("^the preview of the message contains: \"(.*)\"$")
-    public void assertPreviewOfMessageShouldBePrintedWithEncoding(String preview) {
-        String actual = httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".preview");
-        assertThat(actual).contains(preview);
-    }
-
-    @Then("^the keywords of the message is (.*)$")
-    public void assertKeywordsOfMessageShouldDisplay(String keywords) {
-        assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords").keySet())
-            .containsOnly(Splitter.on(',').trimResults().omitEmptyStrings().splitToList(keywords).toArray(new String[0]));
-    }
-
-    @Then("^the message has no keyword$")
-    public void assertMessageHasNoKeyword() {
-        assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords"))
-            .isNullOrEmpty();
-    }
-
-    @Then("^\"([^\"]*)\" should see message \"([^\"]*)\" with keywords \"([^\"]*)\"$")
-    public void assertKeywordsOfMessage(String user, String messageId, String keywords) throws Exception {
-        userStepdefs.execWithUser(user, () -> postWithAListOfIds(messageId));
-
-        assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords").keySet())
-            .containsOnly(Splitter.on(',').trimResults().splitToList(keywords).toArray(new String[0]));
-    }
-
-    @Then("^\"([^\"]*)\" should see message \"([^\"]*)\" without keywords$")
-    public void assertKeywordsEmpty(String user, String messageId) throws Exception {
-        userStepdefs.execWithUser(user, () -> postWithAListOfIds(messageId));
-
-        assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords").keySet())
-            .isEmpty();
-    }
-
-    private void assertAttachment(String attachment, DataTable attachmentProperties) {
-        try {
-            System.out.println(IOUtils.toString(httpClient.response.getEntity().getContent()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        attachmentProperties.asMap(String.class, String.class)
-            .forEach((key, value) -> {
-                System.out.println(key + " : " + value);
-                System.out.println(httpClient.jsonPath.<Object>read(attachment + "." + key));
-                assertThat(String.valueOf(httpClient.jsonPath.<Object>read(attachment + "." + key))).isEqualTo(value);
-            });
-    }
-
-    public String getBlobId() {
-        return httpClient.jsonPath.<String>read(FIRST_MESSAGE + ".blobId");
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/HttpClient.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/HttpClient.java
deleted file mode 100644
index a5e2da81aee..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/HttpClient.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-
-import jakarta.inject.Inject;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.fluent.Request;
-
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.Option;
-
-public class HttpClient {
-    private final MainStepdefs mainStepdefs;
-    private final UserStepdefs userStepdefs;
-
-    public HttpResponse response;
-    public DocumentContext jsonPath;
-
-    @Inject
-    public HttpClient(MainStepdefs mainStepdefs, UserStepdefs userStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.userStepdefs = userStepdefs;
-    }
-
-    public void post(String requestBody) throws Exception {
-        response = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/jmap").build())
-            .addHeader("Authorization", userStepdefs.authenticate(userStepdefs.getConnectedUser()).asString())
-            .addHeader("Accept", org.apache.http.entity.ContentType.APPLICATION_JSON.getMimeType())
-            .bodyString(requestBody, org.apache.http.entity.ContentType.APPLICATION_JSON)
-            .execute()
-            .returnResponse();
-        jsonPath = JsonPath.using(Configuration.defaultConfiguration()
-            .addOptions(Option.SUPPRESS_EXCEPTIONS))
-            .parse(response.getEntity().getContent());
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ImapStepdefs.java
deleted file mode 100644
index c66dd6131de..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/ImapStepdefs.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.transport.mailets.remote.delivery.HeloNameProvider.LOCALHOST;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Map;
-
-import jakarta.inject.Inject;
-
-import org.apache.james.modules.protocols.ImapGuiceProbe;
-import org.apache.james.utils.TestIMAPClient;
-
-import com.github.fge.lambdas.Throwing;
-import com.google.common.collect.Maps;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class ImapStepdefs {
-    private final UserStepdefs userStepdefs;
-    private final MainStepdefs mainStepdefs;
-    private final Map<String, TestIMAPClient> imapConnections;
-
-    @Inject
-    private ImapStepdefs(UserStepdefs userStepdefs, MainStepdefs mainStepdefs) {
-        this.userStepdefs = userStepdefs;
-        this.mainStepdefs = mainStepdefs;
-        this.imapConnections = Maps.newHashMap();
-    }
-
-    public void closeConnections() {
-        imapConnections.values().stream()
-            .forEach(Throwing.consumer(TestIMAPClient::close));
-    }
-
-    @Then("^the user has a IMAP message in mailbox \"([^\"]*)\"$")
-    public void hasMessageInMailbox(String mailbox) throws Throwable {
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(userStepdefs.getConnectedUser(),
-                        userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
-                .select(mailbox);
-            assertThat(testIMAPClient.hasAMessage()).isTrue();
-        }
-    }
-
-    @Then("^the message has IMAP flag \"([^\"]*)\" in mailbox \"([^\"]*)\" for \"([^\"]*)\"$")
-    public void hasMessageWithFlagInMailbox(String flags, String mailbox, String username) throws Throwable {
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(userStepdefs.getConnectedUser(),
-                        userStepdefs.getUserPassword(username))
-                .select(mailbox);
-            assertThat(testIMAPClient.hasAMessageWithFlags(flags))
-                .isTrue();
-        }
-    }
-
-    @Then("^the user has a IMAP notification about (\\d+) new message when selecting mailbox \"([^\"]*)\"$")
-    public void hasANotificationAboutNewMessagesInMailbox(int numOfNewMessage, String mailbox) throws Throwable {
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(userStepdefs.getConnectedUser(),
-                        userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
-                .select(mailbox);
-            assertThat(
-                testIMAPClient.userGetNotifiedForNewMessagesWhenSelectingMailbox(numOfNewMessage))
-                .isTrue();
-        }
-    }
-
-    @Then("^the user does not have a IMAP message in mailbox \"([^\"]*)\"$")
-    public void hasNoMessageInMailbox(String mailbox) throws Throwable {
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(userStepdefs.getConnectedUser(),
-                        userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
-                .select(mailbox);
-            assertThat(testIMAPClient.userDoesNotReceiveMessage())
-                .isTrue();
-        }
-    }
-
-    @SuppressWarnings("resource")
-    @Given("^the user has an open IMAP connection with mailbox \"([^\"]*)\" selected")
-    public void openImapConnectionAndSelectMailbox(String mailbox) throws Throwable {
-        String login = userStepdefs.getConnectedUser();
-        String password = userStepdefs.getUserPassword(login);
-
-        imapConnections.put(mailbox, new TestIMAPClient()
-            .connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-            .login(login, password)
-            .select(mailbox));
-    }
-
-    @Then("^the user set flags via IMAP to \"([^\"]*)\" for all messages in mailbox \"([^\"]*)\"$")
-    public void setFlagsViaIMAPInMailbox(String flags, String mailbox) throws Throwable {
-        TestIMAPClient testIMAPClient = imapConnections.get(mailbox);
-        testIMAPClient.setFlagsForAllMessagesInMailbox(flags);
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @Then("^the user has a IMAP RECENT and a notification about (\\d+) new messages on connection for mailbox \"([^\"]*)\"$")
-    public void checkNotificationForNewMessageOnActiveConnection(int numberOfMessages, String mailbox) throws Throwable {
-        TestIMAPClient testIMAPClient = imapConnections.get(mailbox);
-        assertThat(testIMAPClient).isNotNull();
-        assertThat(testIMAPClient.userGetNotifiedForNewMessages(numberOfMessages)).isTrue();
-    }
-
-    @When("^the user copy by IMAP first message of \"([^\"]*)\" to mailbox \"([^\"]*)\"$")
-    public void copyAMessageByIMAP(String srcMailbox, String destMailbox) throws Throwable {
-        String login = userStepdefs.getConnectedUser();
-        String password = userStepdefs.getUserPassword(login);
-
-        try (TestIMAPClient testIMAPClient = new TestIMAPClient()) {
-            testIMAPClient.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort())
-                .login(login, password)
-                .select(srcMailbox);
-            assertThat(testIMAPClient).isNotNull();
-            testIMAPClient.copyFirstMessage(destMailbox);
-            mainStepdefs.awaitMethod.run();
-        }
-    }
-
-    @Then("^the user has IMAP EXPUNGE and a notification for (\\d+) message sequence number on connection for mailbox \"([^\"]*)\"$")
-    public void checkExpungeNotificationOnActiveConnection(int msn, String mailbox) throws Throwable {
-        TestIMAPClient testIMAPClient = imapConnections.get(mailbox);
-        assertThat(testIMAPClient).isNotNull();
-        assertThat(testIMAPClient.userGetNotifiedForDeletion(msn)).isTrue();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java
deleted file mode 100644
index ebc8fc6cc5d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.MessageIdProbe;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.probe.ACLProbe;
-import org.apache.james.modules.ACLProbeImpl;
-import org.apache.james.modules.MailboxProbeImpl;
-import org.apache.james.probe.DataProbe;
-import org.apache.james.utils.DataProbeImpl;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-
-import io.cucumber.guice.ScenarioScoped;
-
-@ScenarioScoped
-public class MainStepdefs {
-
-    public GuiceJamesServer jmapServer;
-    public DataProbe dataProbe;
-    public MailboxProbeImpl mailboxProbe;
-    public ACLProbe aclProbe;
-    public MessageIdProbe messageIdProbe;
-    public Runnable awaitMethod = () -> { };
-    public MessageId.Factory messageIdFactory;
-    
-    public void init() throws Exception {
-        jmapServer.start();
-        dataProbe = jmapServer.getProbe(DataProbeImpl.class);
-        mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
-        aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
-        messageIdProbe = jmapServer.getProbe(MessageIdProbe.class);
-    }
-
-    public void tearDown() {
-        jmapServer.stop();
-    }
-
-    public MailboxId getMailboxId(String username, String mailbox) {
-        return getMailboxId(MailboxConstants.USER_NAMESPACE, username, mailbox);
-    }
-
-    public MailboxId getMailboxId(String namespace, String username, String mailbox) {
-        return mailboxProbe.getMailboxId(namespace, username, mailbox);
-    }
-    
-    public String getMailboxIds(String username, List<String> mailboxes) {
-        return Joiner.on("\",\"")
-            .join(getMailboxIdsList(username, mailboxes.stream()));
-    }
-
-    public ImmutableList<String> getMailboxIdsList(String username, Stream<String> mailboxes) {
-        return mailboxes.map(mailbox -> getMailboxId(username, mailbox)
-                .serialize())
-            .collect(ImmutableList.toImmutableList());
-    }
-
-    public ImmutableList<String> getMailboxIdsList(String username, Collection<String> mailboxes) {
-        return getMailboxIdsList(username, mailboxes.stream());
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MessageIdStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MessageIdStepdefs.java
deleted file mode 100644
index c738752a199..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MessageIdStepdefs.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.inject.Inject;
-
-import org.apache.james.mailbox.model.MessageId;
-
-import io.cucumber.guice.ScenarioScoped;
-
-@ScenarioScoped
-public class MessageIdStepdefs {
-
-    private final Map<String, MessageId> messageIdsByName;
-
-    @Inject
-    private MessageIdStepdefs() {
-        this.messageIdsByName = new HashMap<>();
-    }
-
-    public MessageId getMessageId(String name) {
-        return messageIdsByName.get(name);
-    }
-
-    public MessageId addMessageId(String name, MessageId messageId) {
-        return messageIdsByName.put(name, messageId);
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
deleted file mode 100644
index 2349a359372..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JMAPTestingConstants.ARGUMENTS;
-import static org.apache.james.jmap.JMAPTestingConstants.NAME;
-import static org.apache.james.jmap.JMAPTestingConstants.calmlyAwait;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import jakarta.inject.Inject;
-
-import org.apache.james.core.Username;
-import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.exception.UnsupportedRightException;
-import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mime4j.dom.Message;
-
-import com.github.fge.lambdas.Throwing;
-import com.google.common.collect.Maps;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class SetMailboxesMethodStepdefs {
-
-    private final MainStepdefs mainStepdefs;
-    private final UserStepdefs userStepdefs;
-    private final HttpClient httpClient;
-
-    @Inject
-    private SetMailboxesMethodStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs, HttpClient httpClient) {
-        this.mainStepdefs = mainStepdefs;
-        this.userStepdefs = userStepdefs;
-        this.httpClient = httpClient;
-    }
-
-    @Given("^mailbox \"([^\"]*)\" with (\\d+) messages$")
-    public void mailboxWithMessages(String mailboxName, int messageCount) {
-        mainStepdefs.mailboxProbe.createMailbox("#private", userStepdefs.getConnectedUser(), mailboxName);
-        MailboxPath mailboxPath = MailboxPath.forUser(Username.of(userStepdefs.getConnectedUser()), mailboxName);
-        IntStream
-            .range(0, messageCount)
-            .forEach(Throwing.intConsumer(i -> appendMessage(mailboxPath, i)));
-        mainStepdefs.awaitMethod.run();
-    }
-
-    private void appendMessage(MailboxPath mailboxPath, int i) throws Exception {
-        mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(), mailboxPath,
-                MessageManager.AppendCommand.from(Message.Builder.of()
-                    .setSubject("test" + i)
-                    .setBody("testBody" + i, StandardCharsets.UTF_8)
-                    .build()));
-    }
-
-    @Given("^\"([^\"]*)\" has a mailbox \"([^\"]*)\"$")
-    public void createMailbox(String username, String mailbox) {
-        mainStepdefs.mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username, mailbox);
-    }
-
-    @Given("^\"([^\"]*)\" shares its mailbox \"([^\"]*)\" with rights \"([^\"]*)\" with \"([^\"]*)\"$")
-    public void shareMailboxWithRight(String owner, String mailboxName, String rights, String shareTo) throws Throwable {
-        userStepdefs.connectUser(owner);
-
-        String mailboxId = mainStepdefs.getMailboxId(owner, mailboxName).serialize();
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"sharedWith\" : { \"" + shareTo + "\" : " + rightsAsString(rights) + " }" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        httpClient.post(requestBody);
-    }
-
-    @Given("^\"([^\"]*)\" shares \"([^\"]*)\" delegated mailbox \"([^\"]*)\" with rights \"([^\"]*)\" with \"([^\"]*)\"$")
-    public void shareMailboxWithRight(String connectedUser, String owner,  String mailboxName, String rights, String shareTo) throws Throwable {
-        userStepdefs.connectUser(connectedUser);
-
-        String mailboxId = mainStepdefs.getMailboxId(owner, mailboxName).serialize();
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailboxId + "\" : {" +
-                "          \"sharedWith\" : { \"" + shareTo + "\" : " + rightsAsString(rights) + " }" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        httpClient.post(requestBody);
-    }
-    
-    private String rightsAsString(String rights) throws UnsupportedRightException {
-        return MailboxACL.Rfc4314Rights
-            .fromSerializedRfc4314Rights(rights)
-            .list()
-            .stream()
-            .map(MailboxACL.Right::asCharacter)
-            .map(String::valueOf)
-            .map(this::surroundWithDoubleQuotes)
-            .collect(Collectors.joining(", ", "[ ", " ]"));
-    }
-    
-    private String surroundWithDoubleQuotes(String input) {
-        return "\"" + input + "\"";
-    }
-    
-    @Given("^\"([^\"]*)\" shares (?:his|her) mailbox \"([^\"]*)\" with \"([^\"]*)\" with \"([^\"]*)\" rights$")
-    public void shareMailbox(String owner, String mailboxName, String shareTo, String rights) throws Throwable {
-        shareMailboxWithRight(owner, mailboxName, rights, shareTo);
-    }
-
-    @When("^\"([^\"]*)\" renames the mailbox, owned by \"([^\"]*)\", \"([^\"]*)\" to \"([^\"]*)\"$")
-    public void renamingMailbox(String user, String mailboxOwner, String currentMailboxName, String newMailboxName) throws Throwable {
-        MailboxId mailboxId = mainStepdefs.getMailboxId("#private", mailboxOwner, currentMailboxName);
-        userStepdefs.connectUser(user);
-        renamingMailbox(mailboxId, newMailboxName);
-    }
-
-    @When("^\"([^\"]*)\" moves the mailbox \"([^\"]*)\" owned by \"([^\"]*)\", into mailbox \"([^\"]*)\" owned by \"([^\"]*)\"$")
-    public void movingMailbox(String user, String mailboxName, String mailboxOwner, String newParentName, String newParentOwner) throws Throwable {
-        String mailbox = mainStepdefs.getMailboxId(mailboxOwner, mailboxName).serialize();
-        String newParent = mainStepdefs.getMailboxId(newParentOwner, newParentName).serialize();
-
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailbox + "\" : {" +
-                "          \"parentId\" : \"" + newParent + "\"" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-
-        userStepdefs.execWithUser(user, () -> httpClient.post(requestBody));
-    }
-
-    @When("^\"([^\"]*)\" moves the mailbox \"([^\"]*)\" owned by \"([^\"]*)\" as top level mailbox$")
-    public void movingMailboxAsTopLevel(String user, String mailboxName, String mailboxOwner) throws Throwable {
-        String mailbox = mainStepdefs.getMailboxId(mailboxOwner, mailboxName).serialize();
-        String requestBody =
-            "[" +
-                "  [ \"setMailboxes\"," +
-                "    {" +
-                "      \"update\": {" +
-                "        \"" + mailbox + "\" : {" +
-                "          \"parentId\" : null" +
-                "        }" +
-                "      }" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]";
-        userStepdefs.execWithUser(user, () -> httpClient.post(requestBody));
-    }
-
-    @When("^\"([^\"]*)\" creates mailbox \"([^\"]*)\" with creationId \"([^\"]*)\" in mailbox \"([^\"]*)\" owned by \"([^\"]*)\"$")
-    public void createChildMailbox(String user, String mailboxName, String creationId, String parentMailboxName, String parentOwner) throws Throwable {
-        String parentMailbox = mainStepdefs.getMailboxId(parentOwner, parentMailboxName).serialize();
-        userStepdefs.execWithUser(user, () -> {
-            String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"create\": {" +
-                    "        \"" + creationId + "\" : {" +
-                    "          \"name\" : \"" + mailboxName + "\"," +
-                    "          \"parentId\" : \"" + parentMailbox + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-            httpClient.post(requestBody);
-        });
-    }
-
-    @When("^\"([^\"]*)\" renames (?:her|his) mailbox \"([^\"]*)\" to \"([^\"]*)\"$")
-    public void renamingMailbox(String user, String actualMailboxName, String newMailboxName) throws Throwable {
-        MailboxId mailboxId = mainStepdefs.getMailboxId(user, actualMailboxName);
-        renamingMailbox(mailboxId, newMailboxName);
-    }
-
-    private void renamingMailbox(MailboxId mailboxId, String newMailboxName) throws Exception {
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId.serialize() + "\" : {" +
-                    "          \"name\" : \"" + newMailboxName + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-        httpClient.post(requestBody);
-    }
-
-    @When("^renaming mailbox \"([^\"]*)\" to \"([^\"]*)\"")
-    public void renamingMailbox(String actualMailboxName, String newMailboxName) throws Throwable {
-        renamingMailbox(userStepdefs.getConnectedUser(), actualMailboxName, newMailboxName);
-    }
-
-    @When("^\"([^\"]*)\" deletes the mailbox \"([^\"]*)\" owned by \"([^\"]*)\"$")
-    public void deletesMailbox(String user, String mailboxName, String owner) throws Throwable {
-        String mailboxId = mainStepdefs.getMailboxId(owner, mailboxName).serialize();
-        userStepdefs.connectUser(user);
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"destroy\": [ \"" + mailboxId + "\" ]" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-        httpClient.post(requestBody);
-    }
-
-    @When("^moving mailbox \"([^\"]*)\" to \"([^\"]*)\"$")
-    public void movingMailbox(String actualMailboxPath, String newParentMailboxPath) throws Throwable {
-        String username = userStepdefs.getConnectedUser();
-        String mailboxId = mainStepdefs.getMailboxId(username, actualMailboxPath).serialize();
-        String parentId = mainStepdefs.getMailboxId(username, newParentMailboxPath).serialize();
-
-        String requestBody =
-                "[" +
-                    "  [ \"setMailboxes\"," +
-                    "    {" +
-                    "      \"update\": {" +
-                    "        \"" + mailboxId + "\" : {" +
-                    "          \"parentId\" : \"" + parentId + "\"" +
-                    "        }" +
-                    "      }" +
-                    "    }," +
-                    "    \"#0\"" +
-                    "  ]" +
-                    "]";
-        httpClient.post(requestBody);
-    }
-
-    @Then("^mailbox \"([^\"]*)\" contains (\\d+) messages$")
-    public void mailboxContainsMessages(String mailboxName, int messageCount) {
-        String username = userStepdefs.getConnectedUser();
-        String mailboxId = mainStepdefs.getMailboxId(username, mailboxName).serialize();
-
-        calmlyAwait.until(() -> {
-            String requestBody = "[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]";
-
-            httpClient.post(requestBody);
-
-            assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-            DocumentContext jsonPath = JsonPath.parse(httpClient.response.getEntity().getContent());
-            assertThat(jsonPath.<String>read(NAME)).isEqualTo("messageList");
-
-            return jsonPath.<List<String>>read(ARGUMENTS + ".messageIds").size() == messageCount;
-        });
-    }
-
-    @Then("^\"([^\"]*)\" receives not updated on mailbox \"([^\"]*)\" with kind \"([^\"]*)\" and message \"([^\"]*)\"$")
-    public void assertNotUpdatedWithGivenProperties(String userName, String mailboxName, String type, String message) {
-        String mailboxId = mainStepdefs.getMailboxId(userName, mailboxName).serialize();
-        assertThat(httpClient.response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThat(httpClient.jsonPath.<String>read(NAME)).isEqualTo("mailboxesSet");
-        
-        Map<String, Map<String, String>> notUpdated = httpClient.jsonPath.<Map<String, Map<String, String>>>read(ARGUMENTS + ".notUpdated");
-        assertThat(notUpdated).hasSize(1);
-        Map<String, String> parameters = notUpdated.get(mailboxId);
-        assertThat(parameters).contains(Maps.immutableEntry("type", type),
-                Maps.immutableEntry("description", message));
-    }
-
-    @Then("^mailbox \"([^\"]*)\" owned by \"([^\"]*)\" is not updated")
-    public void assertNotUpdated(String mailboxName, String owner) {
-        String mailboxId = mainStepdefs.getMailboxId(owner, mailboxName).serialize();
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].notUpdated"))
-            .containsOnlyKeys(mailboxId);
-    }
-
-    @Then("^mailbox \"([^\"]*)\" owned by \"([^\"]*)\" is not destroyed$")
-    public void assertNotDestroyed(String mailboxName, String owner) {
-        String mailboxId = mainStepdefs.getMailboxId(owner, mailboxName).serialize();
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].notDestroyed"))
-            .containsOnlyKeys(mailboxId);
-    }
-
-
-    @Then("^mailbox with creationId \"([^\"]*)\" is not created")
-    public void assertNotCreated(String creationId) {
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].notCreated"))
-            .containsOnlyKeys(creationId);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMessagesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMessagesMethodStepdefs.java
deleted file mode 100644
index 4fe2fa4bcf1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/SetMessagesMethodStepdefs.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.google.common.base.Splitter;
-import jakarta.inject.Inject;
-import jakarta.mail.Flags;
-
-import org.apache.james.core.Username;
-import org.apache.james.jmap.model.Keywords;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MessageId;
-
-import com.google.common.collect.ImmutableList;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class SetMessagesMethodStepdefs {
-
-    private final MainStepdefs mainStepdefs;
-    private final UserStepdefs userStepdefs;
-    private final HttpClient httpClient;
-    private final MessageIdStepdefs messageIdStepdefs;
-
-    @Inject
-    private SetMessagesMethodStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs, HttpClient httpClient, MessageIdStepdefs messageIdStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.userStepdefs = userStepdefs;
-        this.httpClient = httpClient;
-        this.messageIdStepdefs = messageIdStepdefs;
-    }
-
-    @When("^\"([^\"]*)\" moves \"([^\"]*)\" to user mailbox \"([^\"]*)\"$")
-    public void moveMessageToMailboxWithUser(String username, String message, String mailbox) {
-        userStepdefs.execWithUser(username, () -> moveMessageToMailbox(message, mailbox));
-    }
-
-    @When("^the user moves \"([^\"]*)\" to user mailbox \"([^\"]*)\"$")
-    public void moveMessageToMailbox(String message, String mailbox) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        MailboxId mailboxId = mainStepdefs.getMailboxId(userStepdefs.getConnectedUser(), mailbox);
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @When("^the user moves \"([^\"]*)\" to user mailbox \"([^\"]*)\" and set flags \"([^\"]*)\"$")
-    public void moveMessageToMailboxAndChangeFlags(String message, String mailbox, String keywords) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        MailboxId mailboxId = mainStepdefs.getMailboxId(userStepdefs.getConnectedUser(), mailbox);
-        String keywordString = toKeywordsString(Splitter.on(',').trimResults().omitEmptyStrings().splitToList(keywords));
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"mailboxIds\": [\"" + mailboxId.serialize() + "\"]," +
-            "        \"keywords\": {" + keywordString + "}" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @When("^\"([^\"]*)\" copies \"([^\"]*)\" from mailbox \"([^\"]*)\" to mailbox \"([^\"]*)\"$")
-    public void copyMessageToMailbox(String username, String message, String sourceMailbox, String destinationMailbox) {
-        userStepdefs.execWithUser(username, () -> copyMessageToMailbox(message, sourceMailbox, destinationMailbox));
-    }
-
-    @When("^the user copies \"([^\"]*)\" from mailbox \"([^\"]*)\" to mailbox \"([^\"]*)\"$")
-    public void copyMessageToMailbox(String message, String sourceMailbox, String destinationMailbox) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        String user = userStepdefs.getConnectedUser();
-        MailboxId sourceMailboxId = mainStepdefs.getMailboxId(user, sourceMailbox);
-        MailboxId destinationMailboxId = mainStepdefs.getMailboxId(user, destinationMailbox);
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"mailboxIds\": [\"" + destinationMailboxId.serialize() + "\",\"" + sourceMailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @When("^\"([^\"]*)\" copies \"([^\"]*)\" from mailbox \"([^\"]*)\" of user \"([^\"]*)\" to mailbox \"([^\"]*)\" of user \"([^\"]*)\"$")
-    public void copyMessageToMailbox(String username, String message, String sourceMailbox, String sourceUser, String destinationMailbox, String destinationUser) {
-        userStepdefs.execWithUser(username, () -> copyMessageToMailbox(message, sourceMailbox, sourceUser, destinationMailbox, destinationUser));
-    }
-
-    private void copyMessageToMailbox(String message, String sourceMailbox, String sourceUser, String destinationMailbox, String destinationUser) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        MailboxId sourceMailboxId = mainStepdefs.getMailboxId(sourceUser, sourceMailbox);
-        MailboxId destinationMailboxId = mainStepdefs.getMailboxId(destinationUser, destinationMailbox);
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"mailboxIds\": [\"" + destinationMailboxId.serialize() + "\",\"" + sourceMailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @Given("^\"([^\"]*)\" moves \"([^\"]*)\" to mailbox \"([^\"]*)\" of user \"([^\"]*)\"$")
-    public void moveMessageToMailbox(String username, String message, String destinationMailbox, String destinationUser) {
-        userStepdefs.execWithUser(username, () -> moveMessageToMailbox(message, destinationMailbox, destinationUser));
-    }
-
-    private void moveMessageToMailbox(String message, String destinationMailbox, String destinationUser) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        MailboxId destinationMailboxId = mainStepdefs.getMailboxId(destinationUser, destinationMailbox);
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"mailboxIds\": [\"" + destinationMailboxId.serialize() + "\"]" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @When("^\"([^\"]*)\" sets flags \"([^\"]*)\" on message \"([^\"]*)\"$")
-    public void setFlags(String username, String keywords, String message) {
-        userStepdefs.execWithUser(username, () -> setFlags(keywords, message));
-    }
-
-    @When("^\"([^\"]*)\" marks the message \"([^\"]*)\" as flagged$")
-    public void flag(String username, String message) {
-        userStepdefs.execWithUser(username, () -> {
-            MessageId messageId = messageIdStepdefs.getMessageId(message);
-
-            httpClient.post("[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-                "        \"isFlagged\": true" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]");
-            mainStepdefs.awaitMethod.run();
-        });
-    }
-
-    @When("^\"([^\"]*)\" marks the message \"([^\"]*)\" as draft")
-    public void draft(String username, String message) throws Throwable {
-        userStepdefs.execWithUser(username, () -> {
-            MessageId messageId = messageIdStepdefs.getMessageId(message);
-
-            httpClient.post("[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-                "        \"isDraft\": true" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]");
-            mainStepdefs.awaitMethod.run();
-        });
-    }
-
-
-    @When("^\"([^\"]*)\" destroys message \"([^\"]*)\"$")
-    public void destroyMessage(String username, String message) {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        userStepdefs.execWithUser(username, () -> {
-            httpClient.post("[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"destroy\": [ \"" + messageId.serialize() + "\" ]" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]");
-            mainStepdefs.awaitMethod.run();
-        });
-    }
-
-    @Given("^\"([^\"]*)\" tries to create a draft message \"([^\"]*)\" in mailbox \"([^\"]*)\"$")
-    public void createDraft(String username, String message, String mailboxName) {
-        userStepdefs.execWithUser(username, () -> {
-            String mailboxId = mainStepdefs.getMailboxId(username, mailboxName).serialize();
-            httpClient.post("[" +
-                "  [" +
-                "    \"setMessages\"," +
-                "    {" +
-                "      \"create\": { \"" + message  + "\" : {" +
-                "        \"subject\": \"subject\"," +
-                "        \"from\": { \"name\": \"Me\", \"email\": \"" + username + "\"}," +
-                "        \"to\": [{ \"name\": \"Me\", \"email\": \"" + username + "\"}]," +
-                "        \"keywords\": {\"$Draft\": true}," +
-                "        \"mailboxIds\": [\"" + mailboxId + "\"]" +
-                "      }}" +
-                "    }," +
-                "    \"#0\"" +
-                "  ]" +
-                "]");
-            mainStepdefs.awaitMethod.run();
-            Optional.ofNullable(
-                httpClient.jsonPath.<String>read("[0][1].created." + message + ".id"))
-                .map(mainStepdefs.messageIdFactory::fromString)
-                .ifPresent(id -> messageIdStepdefs.addMessageId(message, id));
-        });
-    }
-
-    @When("^the user sets flags \"([^\"]*)\" on message \"([^\"]*)\"$")
-    public void setFlags(String keywords, String message) throws Throwable {
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        String keywordString = toKeywordsString(Splitter.on(',').omitEmptyStrings().trimResults().splitToList(keywords));
-
-        httpClient.post("[" +
-            "  [" +
-            "    \"setMessages\"," +
-            "    {" +
-            "      \"update\": { \"" + messageId.serialize() + "\" : {" +
-            "        \"keywords\": {" + keywordString + "}" +
-            "      }}" +
-            "    }," +
-            "    \"#0\"" +
-            "  ]" +
-            "]");
-        mainStepdefs.awaitMethod.run();
-    }
-
-    private String toKeywordsString(List<String> keywords) {
-        return keywords
-                .stream()
-                .map(value -> "\"" + value + "\" : true")
-                .collect(Collectors.joining(","));
-    }
-
-    @When("^message \"([^\"]*)\" has flags (.*) in mailbox \"([^\"]*)\" of user \"([^\"]*)\"$")
-    public void setMessageFlagsInSpecifiedMailbox(String message, String flags, String mailbox, String mailboxOwner) throws Exception {
-        Flags newFlags = Keywords.lenientFactory().fromCollection(Splitter.on(',').trimResults().splitToList(flags)).asFlags();
-        Username username = Username.of(userStepdefs.getConnectedUser());
-        MessageId messageId = messageIdStepdefs.getMessageId(message);
-        MailboxId mailboxId = mainStepdefs.getMailboxId(mailboxOwner, mailbox);
-
-        mainStepdefs.messageIdProbe.updateNewFlags(username, newFlags, messageId, ImmutableList.of(mailboxId));
-        mainStepdefs.awaitMethod.run();
-    }
-
-    @Then("^message \"([^\"]*)\" is not updated$")
-    public void assertNotUpdate(String messageName) {
-        MessageId id = messageIdStepdefs.getMessageId(messageName);
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].notUpdated"))
-            .containsOnlyKeys(id.serialize());
-    }
-
-    @Then("^message \"([^\"]*)\" is updated$")
-    public void assertUpdated(String messageName) {
-        MessageId id = messageIdStepdefs.getMessageId(messageName);
-        assertThat(httpClient.jsonPath.<List<String>>read("[0][1].updated"))
-            .containsOnly(id.serialize());
-    }
-
-    @Then("^message \"([^\"]*)\" is not created$")
-    public void assertNotCreated(String messageName) {
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].notCreated"))
-            .containsOnlyKeys(messageName);
-    }
-
-    @Then("^message \"([^\"]*)\" is created$")
-    public void assertCreated(String messageName) {
-        assertThat(httpClient.jsonPath.<Map<String, String>>read("[0][1].created"))
-            .containsOnlyKeys(messageName);
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlags.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlags.java
deleted file mode 100644
index 26f524a5e40..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlags.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import java.util.List;
-
-import jakarta.mail.Flags;
-
-import org.apache.james.jmap.model.Keyword;
-import org.apache.james.mailbox.FlagsBuilder;
-
-import com.google.common.collect.ImmutableList;
-
-public class StringListToFlags {
-    public static Flags fromFlagList(List<String> flagList) {
-        ImmutableList<Flags> flags = flagList.stream()
-            .map(StringListToFlags::toFlags)
-            .collect(ImmutableList.toImmutableList());
-        return new FlagsBuilder().add(flags)
-            .build();
-    }
-
-    private static Flags toFlags(String flag) {
-        if (Keyword.ANSWERED.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.ANSWERED);
-        }
-        if (Keyword.DELETED.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.DELETED);
-        }
-        if (Keyword.DRAFT.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.DRAFT);
-        }
-        if (Keyword.RECENT.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.RECENT);
-        }
-        if (Keyword.FLAGGED.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.FLAGGED);
-        }
-        if (Keyword.SEEN.getFlagName().equals(flag)) {
-            return new Flags(Flags.Flag.SEEN);
-        }
-        return new Flags(flag);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlagsTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlagsTest.java
deleted file mode 100644
index ede4c85a6cf..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/StringListToFlagsTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import jakarta.mail.Flags;
-import jakarta.mail.Flags.Flag;
-
-import org.apache.james.jmap.model.Keyword;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-
-public class StringListToFlagsTest {
-    @Test
-    public void fromFlagListShouldConvertAnwseredFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.ANSWERED.getFlagName())))
-            .isEqualTo(new Flags(Flag.ANSWERED));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertSeenFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.SEEN.getFlagName())))
-            .isEqualTo(new Flags(Flag.SEEN));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertDraftFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.DRAFT.getFlagName())))
-            .isEqualTo(new Flags(Flag.DRAFT));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertRecentFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.RECENT.getFlagName())))
-            .isEqualTo(new Flags(Flag.RECENT));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertDeletedFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.DELETED.getFlagName())))
-            .isEqualTo(new Flags(Flag.DELETED));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertFlaggedFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of(Keyword.FLAGGED.getFlagName())))
-            .isEqualTo(new Flags(Flag.FLAGGED));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertValidJMAPFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of("$Any")))
-            .isEqualTo(new Flags("$Any"));
-    }
-
-    @Test
-    public void fromFlagListShouldConvertInvalidJMAPFlag() {
-        assertThat(StringListToFlags.fromFlagList(ImmutableList.of("op§")))
-            .isEqualTo(new Flags("op§"));
-    }
-
-}
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
deleted file mode 100644
index 0ea0fd7689d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UploadStepdefs.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.BufferedInputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.Locale;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import jakarta.inject.Inject;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.fluent.Async;
-import org.apache.http.client.fluent.Content;
-import org.apache.http.client.fluent.Executor;
-import org.apache.http.client.fluent.Request;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.james.jmap.AccessToken;
-import org.apache.james.util.io.CountDownConsumeInputStream;
-import org.apache.james.util.io.ZeroedInputStream;
-
-import com.google.common.base.CharMatcher;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-
-@ScenarioScoped
-public class UploadStepdefs {
-    private static final int _24K = 24 * 1024;
-    private static final int _1M = 1024 * 1024;
-    private static final int _10M = 10 * _1M;
-
-    private final UserStepdefs userStepdefs;
-    private final MainStepdefs mainStepdefs;
-    private final URI uploadUri;
-    private HttpResponse response;
-    private Future<Content> async;
-    private boolean isCanceled;
-
-    @Inject
-    private UploadStepdefs(UserStepdefs userStepdefs, MainStepdefs mainStepdefs) throws URISyntaxException {
-        this.userStepdefs = userStepdefs;
-        this.mainStepdefs = mainStepdefs;
-        uploadUri = baseUri(mainStepdefs.jmapServer).setPath("/upload").build();
-    }
-
-    @Given("^\"([^\"]*)\" is starting uploading a content$")
-    public void userStartUploadContent(String username) {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-
-        CountDownLatch startSignal = new CountDownLatch(2);
-        CountDownConsumeInputStream bodyStream = new CountDownConsumeInputStream(startSignal);
-        Request request = Request.Post(uploadUri)
-            .bodyStream(new BufferedInputStream(bodyStream, _1M), org.apache.http.entity.ContentType.DEFAULT_BINARY);
-        if (accessToken != null) {
-            request.addHeader("Authorization", accessToken.asString());
-        }
-        async = Async.newInstance().execute(request, new FutureCallback<Content>() {
-            
-            @Override
-            public void failed(Exception ex) {
-            }
-            
-            @Override
-            public void completed(Content result) {
-            }
-            
-            @Override
-            public void cancelled() {
-                bodyStream.getStartSignal().countDown();
-                if (bodyStream.getStartSignal().getCount() == 1) {
-                    isCanceled = true;
-                }
-            }
-        });
-    }
-
-    @When("^\"([^\"]*)\" upload a content$")
-    public void userUploadContent(String username) throws Throwable {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        Request request = Request.Post(uploadUri)
-            .bodyStream(new BufferedInputStream(new ZeroedInputStream(_1M), _1M), org.apache.http.entity.ContentType.DEFAULT_BINARY);
-
-        request.addHeader("Authorization", accessToken.asString());
-        response = Executor.newInstance(newClient())
-            .execute(request)
-            .returnResponse();
-    }
-
-    @When("^someone upload a content without authentification$")
-    public void userUploadContentWithoutAuthentification() throws Throwable {
-        Request request = Request.Post(uploadUri)
-            .bodyStream(new BufferedInputStream(new ZeroedInputStream(_24K), _24K), org.apache.http.entity.ContentType.DEFAULT_BINARY);
-        response = Executor.newInstance(newClient())
-            .execute(request)
-            .returnResponse();
-    }
-
-    private CloseableHttpClient newClient() {
-        return HttpClientBuilder.create()
-            .disableAutomaticRetries()
-            .build();
-    }
-
-    @When("^\"([^\"]*)\" upload a content without content type$")
-    public void userUploadContentWithoutContentType(String username) throws Throwable {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        Request request = Request.Post(uploadUri)
-                .bodyByteArray("some text".getBytes(StandardCharsets.UTF_8));
-        if (accessToken != null) {
-            request.addHeader("Authorization", accessToken.asString());
-        }
-        response = request.execute().returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" upload a too big content$")
-    public void userUploadTooBigContent(String username) throws Throwable {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        Request request = Request.Post(uploadUri)
-                .bodyStream(new BufferedInputStream(new ZeroedInputStream(_10M), _10M), org.apache.http.entity.ContentType.DEFAULT_BINARY);
-        if (accessToken != null) {
-            request.addHeader("Authorization", accessToken.asString());
-        }
-        response = request.execute().returnResponse();
-    }
-
-    @When("^\"([^\"]*)\" checks for the availability of the upload endpoint$")
-    public void optionUpload(String username) throws Throwable {
-        userStepdefs.authenticate(username);
-        Request request = Request.Options(uploadUri);
-        response = request.execute().returnResponse();
-    }
-
-    @When("^someone checks without authentification for the availability of the upload endpoint$")
-    public void optionUploadWithoutAuthentification() throws Throwable {
-        Request request = Request.Options(uploadUri);
-        response = request.execute().returnResponse();
-    }
-
-    @Then("^the user disconnect$")
-    public void stopUpload() {
-        async.cancel(true);
-    }
-
-    @Then("^the user should receive an authorized response$")
-    public void httpAuthorizedStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-    }
-
-    @Then("^the user should receive a created response$")
-    public void httpCreatedStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(201);
-    }
-
-    @Then("^the user should receive bad request response$")
-    public void httpBadRequestStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(400);
-    }
-
-    @Then("^the user should receive a not authorized response$")
-    public void httpUnauthorizedStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(401);
-    }
-
-    @Then("^the user should receive a request entity too large response$")
-    public void httpRequestEntityTooBigStatus() {
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(413);
-    }
-
-    @Then("^the user should receive a specified JSON content$")
-    public void jsonResponse() throws Exception {
-        assertThat(response.getHeaders("Content-Type"))
-            .extracting(header ->
-                normalizeContentType(header.getValue()))
-            .containsExactly(
-                normalizeContentType(org.apache.http.entity.ContentType.APPLICATION_JSON.toString()));
-        DocumentContext jsonPath = JsonPath.parse(response.getEntity().getContent());
-        jsonPath.<String>read("blobId");
-        assertThat(jsonPath.<String>read("type")).isEqualTo("application/octet-stream");
-        assertThat(jsonPath.<Integer>read("size")).isEqualTo(_1M);
-    }
-
-    private String normalizeContentType(String input) {
-        return CharMatcher.whitespace().removeFrom(input.toLowerCase(Locale.US));
-    }
-
-    @Then("^\"([^\"]*)\" should be able to retrieve the content$")
-    public void contentShouldBeRetrievable(String username) throws Exception {
-        AccessToken accessToken = userStepdefs.authenticate(username);
-        DocumentContext jsonPath = JsonPath.parse(response.getEntity().getContent());
-        Request request = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + jsonPath.<String>read("blobId")).build());
-        if (accessToken != null) {
-            request.addHeader("Authorization", accessToken.asString());
-        }
-        response = request.execute().returnResponse();
-        httpAuthorizedStatus();
-    }
-
-    @Then("^the request should be marked as canceled$")
-    public void requestHasBeenCanceled() {
-        assertThat(isCanceled).isTrue();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
deleted file mode 100644
index c956285aaa9..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber;
-
-import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
-import static org.apache.james.jmap.JmapURIBuilder.baseUri;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import com.google.common.base.Splitter;
-import jakarta.inject.Inject;
-
-import org.apache.james.core.Username;
-import org.apache.james.jmap.AccessToken;
-
-import com.github.fge.lambdas.Throwing;
-import com.github.fge.lambdas.runnable.ThrowingRunnable;
-import com.google.common.base.Preconditions;
-import com.google.common.hash.Hashing;
-
-import io.cucumber.guice.ScenarioScoped;
-import io.cucumber.java.en.Given;
-
-@ScenarioScoped
-public class UserStepdefs {
-
-    private final MainStepdefs mainStepdefs;
-    
-    private Map<String, String> passwordByUser;
-    private Set<String> domains;
-    private Map<String, AccessToken> tokenByUser;
-    private Optional<String> lastConnectedUser;
-    
-    @Inject
-    private UserStepdefs(MainStepdefs mainStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.domains = new HashSet<>();
-        this.passwordByUser = new HashMap<>();
-        this.tokenByUser = new HashMap<>();
-        this.lastConnectedUser = Optional.empty();
-    }
-
-    public void execWithUser(String user, ThrowingRunnable sideEffect) {
-        Optional<String> previousConnectedUser = lastConnectedUser;
-        connectUser(user);
-        try {
-            sideEffect.run();
-        } finally {
-            previousConnectedUser.ifPresent(Throwing.consumer(this::connectUser));
-        }
-    }
-
-    public String getConnectedUser() {
-        Preconditions.checkArgument(lastConnectedUser.isPresent(), "No user is connected");
-
-        return lastConnectedUser.get();
-    }
-
-    public String getUserPassword(String user) {
-        Preconditions.checkArgument(passwordByUser.containsKey(user), "User has no password created yet");
-
-        return passwordByUser.get(user);
-    }
-
-    @Given("^a domain named \"([^\"]*)\"$")
-    public void createDomain(String domain) throws Exception {
-        mainStepdefs.dataProbe.addDomain(domain);
-        domains.add(domain);
-    }
-
-    @Given("^some users \"(.*)\"$")
-    public void createUsers(String users) {
-        Splitter.on(',').trimResults()
-            .splitToStream(users)
-            .forEach(Throwing.consumer(this::createUser));
-    }
-    
-    private String unquote(String quotedString) {
-        return quotedString.substring(1, quotedString.length() - 1);
-    }
-
-    @Given("^a user \"([^\"]*)\"$")
-    public void createUser(String username) throws Exception {
-        String password = generatePassword(username);
-        mainStepdefs.dataProbe.addUser(username, password);
-        passwordByUser.put(username, password);
-    }
-
-    @Given("^a connected user \"([^\"]*)\"$")
-    public void createConnectedUser(String username) throws Exception {
-        createUser(username);
-        connectUser(username);
-    }
-
-    @Given("^\"([^\"]*)\" is connected$")
-    public void connectUser(String username) {
-        AccessToken accessToken = authenticate(username);
-        tokenByUser.put(username, accessToken);
-        lastConnectedUser = Optional.of(username);
-    }
-
-    public AccessToken authenticate(String username) {
-        return tokenByUser.computeIfAbsent(username, (user) -> {
-            String password = passwordByUser.get(user);
-            Preconditions.checkState(password != null, "unknown user %s", user);
-
-            return authenticateJamesUser(baseUri(mainStepdefs.jmapServer), Username.of(user), password);
-        });
-    }
-
-    private String generatePassword(String username) {
-        return Hashing.murmur3_128().hashString(username, StandardCharsets.UTF_8).toString();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/BooleanFromString.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/BooleanFromString.java
deleted file mode 100644
index 5d89e9b269d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/BooleanFromString.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import java.util.Optional;
-
-public class BooleanFromString implements ObjectFromString<Boolean> {
-
-    @Override
-    public Optional<Boolean> extract(String source) {
-        if (source.equals("true") || source.equals("false")) {
-            return Optional.of(Boolean.valueOf(source));
-        }
-        return Optional.empty();
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/IntegerFromString.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/IntegerFromString.java
deleted file mode 100644
index 4af2a60f595..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/IntegerFromString.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import java.util.Optional;
-
-public class IntegerFromString implements ObjectFromString<Integer> {
-
-    @Override
-    public Optional<Integer> extract(String source) {
-        try {
-            return Optional.of(Integer.valueOf(source));
-        } catch (Exception e) {
-            return Optional.empty();
-        }
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromString.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromString.java
deleted file mode 100644
index 1cd2c00ac21..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromString.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import java.util.Optional;
-
-public interface ObjectFromString<T> {
-
-    Optional<T> extract(String source);
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromStringExtractor.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromStringExtractor.java
deleted file mode 100644
index 1c8d4e51773..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/ObjectFromStringExtractor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableList;
-
-public class ObjectFromStringExtractor {
-
-    private static final List<ObjectFromString<?>> EXTRACTORS = ImmutableList.of(
-            new StringFromString(),
-            new IntegerFromString(),
-            new BooleanFromString());
-
-    public Object extract(String value) {
-        return EXTRACTORS.stream()
-            .map(extractor -> extractor.extract(value))
-            .flatMap(Optional::stream)
-            .findFirst()
-            .orElse(null);
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/StringFromString.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/StringFromString.java
deleted file mode 100644
index 99a5117ba5a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/StringFromString.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import java.util.Optional;
-
-public class StringFromString implements ObjectFromString<String> {
-
-    @Override
-    public Optional<String> extract(String source) {
-        if (source.startsWith("\"") && source.endsWith("\"")) {
-            return Optional.of(source.substring(1, source.length() - 1));
-        }
-        return Optional.empty();
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/TableRow.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/TableRow.java
deleted file mode 100644
index c691c96c2d5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/util/TableRow.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.draft.methods.integration.cucumber.util;
-
-import com.google.common.base.MoreObjects;
-
-public class TableRow {
-
-    private String key;
-    private String value;
-
-    public TableRow(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public Object getValue() {
-        return new ObjectFromStringExtractor().extract(value);
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects
-                .toStringHelper(this)
-                .add("key", key)
-                .add("value", value)
-                .toString();
-    }
-}
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/attachment/nonIndexableAttachment.html b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/attachment/nonIndexableAttachment.html
deleted file mode 100644
index e692316e3a1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/attachment/nonIndexableAttachment.html
+++ /dev/null
@@ -1,827 +0,0 @@
-<!DOCTYPE html>
-<html class="mozilla" lang="en"><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    
-
-
-
-
-
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=Edge">
-<meta name="application-name" content="JIRA" data-name="jira" data-version="6.4.5"><meta name="ajs-serverRenderedViewIssue" content="true">
-<meta name="ajs-hasCriteriaAutoUpdate" content="true">
-<meta name="ajs-viewissue-use-history-api" content="false">
-<meta name="ajs-viewissue-max-cache-size" content="">
-<meta name="ajs-autocomplete-enabled" content="true">
-<meta name="ajs-view-issue-trace-key" content="jira.issue.refreshed">
-<meta name="ajs-view-issue-psycho-key" content="jira.psycho.issue.refreshed">
-<meta name="ajs-view-issue-refreshed-cached-key" content="jira.psycho.issue.refreshed.cached">
-<meta name="ajs-return-to-search-trace-key" content="jira.returned.to.search">
-<meta name="ajs-return-to-search-psycho-key" content="jira.psycho.returned.to.search">
-<meta name="ajs-default-avatar-url" content="https://ci.open-paas.org/jira/secure/useravatar?size=xsmall&amp;avatarId=10123">
-<meta name="ajs-jira.issues.preferred.layout.key" content="split-view">
-<meta name="ajs-max-recent-searchers" content="10">
-<meta name="ajs-jira-base-url" content="https://ci.open-paas.org/jira">
-<meta name="ajs-dev-mode" content="false">
-<meta name="ajs-context-path" content="/jira">
-<meta name="ajs-version-number" content="6.4.5">
-<meta name="ajs-build-number" content="64020">
-<meta name="ajs-is-beta" content="false">
-<meta name="ajs-is-rc" content="false">
-<meta name="ajs-is-snapshot" content="false">
-<meta name="ajs-is-milestone" content="false">
-<meta name="ajs-remote-user" content="scolson">
-<meta name="ajs-remote-user-fullname" content="Stephane COLSON">
-<meta name="ajs-user-locale" content="en_US">
-<meta name="ajs-user-locale-group-separator" content=",">
-<meta name="ajs-app-title" content="OpenPaas-Linagora">
-<meta name="ajs-keyboard-shortcuts-enabled" content="true">
-<meta name="ajs-keyboard-accesskey-modifier" content="Alt+Shift">
-<meta name="ajs-enabled-dark-features" content="[&quot;com.atlassian.jira.projects.issuenavigator&quot;,&quot;com.atlassian.jira.projects.ProjectCentricNavigation.Switch&quot;,&quot;jira.plugin.devstatus.phasetwo.enabled&quot;,&quot;com.atlassian.jira.config.PDL&quot;,&quot;jira.frother.reporter.field&quot;,&quot;jira.plugin.devstatus.phasetwo&quot;,&quot;com.atlassian.jira.darkfeature.CommonHeader&quot;,&quot;app-switcher.new&quot;,&quot;frother.assignee.field&quot;,&quot;jira.issue.status.lozenge&quot;]">
-<meta name="ajs-date-relativize" content="true">
-<meta name="ajs-date-time" content="h:mm a">
-<meta name="ajs-date-day" content="EEEE h:mm a">
-<meta name="ajs-date-dmy" content="dd/MMM/yy">
-<meta name="ajs-date-complete" content="dd/MMM/yy h:mm a">
-<meta name="ajs-in-admin-mode" content="false">
-<meta name="ajs-is-sysadmin" content="true">
-<meta name="ajs-is-admin" content="true">
-<meta name="ajs-outgoing-mail-enabled" content="true">
-<script type="text/javascript">var AJS=AJS||{};AJS.debug=true;</script><meta name="ajs-admin-quicksearch-show" content="true">
-
-
-    
-<meta id="atlassian-token" name="atlassian-token" content="BE2F-79PL-H8QS-2STB|99bf85b35fda4cb18ee69314eef5a1392be0a3d3|lin">
-
-
-
-<link rel="shortcut icon" href="https://ci.open-paas.org/jira/s/en_US-j84vrp/64020/3/_/favicon.ico">
-
-
-    
-
-
-<!--[if IE]><![endif]-->
-<script type="text/javascript">var contextPath = '/jira';</script>
-<script>
-window.WRM=window.WRM||{};window.WRM._unparsedData=window.WRM._unparsedData||{};
-WRM._unparsedData["com.atlassian.plugins.atlassian-plugins-webresource-plugin:context-path.context-path"]="\"/jira\"";
-WRM._unparsedData["jira.webresources:dateFormatProvider.dateFormat"]="{\"meridiem\":[\"AM\",\"PM\"],\"eras\":[\"BC\",\"AD\"],\"months\":[\"January\",\"February\",\"March\",\"April\",\"May\",\"June\",\"July\",\"August\",\"September\",\"October\",\"November\",\"December\"],\"monthsShort\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"],\"weekdaysShort\":[\"Sun\",\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\"],\"weekdays\":[\"Sunday\",\"Monday\",\"Tuesday\",\"Wednesday\",\"Thursday\",\"Friday\",\"Saturday\"]}";
-WRM._unparsedData["com.atlassian.jira.jira-header-plugin:dismissedFlags.flags"]="{\"dismissed\":[\"com.atlassian.jira.tzdetect.-36000000,-36000000\",\"com.atlassian.jira.tzdetect.-18000000,-14400000\",\"com.atlassian.jira.tzdetect.-28800000,-25200000\"]}";
-WRM._unparsedData["com.atlassian.jira.jira-header-plugin:newsletter-signup-tip.newsletterSignup"]="{\"formUrl\":\"https://www.atlassian.com/apis/exact-target/{0}/subscribe?mailingListId=1239131\",\"userEmail\":\"scolson@linagora.com\",\"showNewsletterTip\":false}";
-WRM._unparsedData["com.atlassian.jira.plugins.greenhopper-marketing-plugin:gh-advertising-resources.urls"]="{\"hamlet\":\"https://hamlet.atlassian.com/\",\"lasso\":\"https://id.atlassian.com/\",\"mac\":\"https://my.atlassian.com\"}";
-WRM._unparsedData["com.atlassian.jira.plugins.jira-admin-helper-plugin:notification-event-provider.notification-event-data"]="[{\"id\":1,\"name\":\"Issue Created\",\"isDefault\":true},{\"id\":2,\"name\":\"Issue Updated\"},{\"id\":3,\"name\":\"Issue Assigned\"},{\"id\":4,\"name\":\"Issue Resolved\"},{\"id\":5,\"name\":\"Issue Closed\"},{\"id\":6,\"name\":\"Issue Commented\"},{\"id\":14,\"name\":\"Issue Comment Edited\"},{\"id\":17,\"name\":\"Issue Comment Deleted\"},{\"id\":7,\"name\":\"Issue Reopened\"},{\"id\":8,\"name\":\"Issue Deleted\"},{\"id\":9,\"name\":\"Issue Moved\"},{\"id\":10,\"name\":\"Work Logged On Issue\"},{\"id\":11,\"name\":\"Work Started On Issue\"},{\"id\":12,\"name\":\"Work Stopped On Issue\"},{\"id\":15,\"name\":\"Issue Worklog Updated\"},{\"id\":16,\"name\":\"Issue Worklog Deleted\"},{\"id\":13,\"name\":\"Generic Event\"}]";
-WRM._unparsedData["com.atlassian.jira.plugins.jira-admin-helper-plugin:permissions-provider.permissions-data"]="[{\"permissions\":[{\"name\":\"Administer Projects\",\"id\":\"23\"},{\"name\":\"Browse Projects\",\"id\":\"10\"},{\"name\":\"View Development Tools\",\"id\":\"29\"},{\"name\":\"View Read-Only Workflow\",\"id\":\"45\"}],\"name\":\"Project Permissions\"},{\"permissions\":[{\"name\":\"Create Issues\",\"id\":\"11\"},{\"name\":\"Edit Issues\",\"id\":\"12\"},{\"name\":\"Transition Issues\",\"id\":\"46\"},{\"name\":\"Schedule Issues\",\"id\":\"28\"},{\"name\":\"Move Issues\",\"id\":\"25\"},{\"name\":\"Assign Issues\",\"id\":\"13\"},{\"name\":\"Assignable User\",\"id\":\"17\"},{\"name\":\"Resolve Issues\",\"id\":\"14\"},{\"name\":\"Close Issues\",\"id\":\"18\"},{\"name\":\"Modify Reporter\",\"id\":\"30\"},{\"name\":\"Delete Issues\",\"id\":\"16\"},{\"name\":\"Link Issues\",\"id\":\"21\"},{\"name\":\"Set Issue Security\",\"id\":\"26\"}],\"name\":\"Issue Permissions\"},{\"permissions\":[{\"name\":\"View Voters and Watchers\",\"id\":\"31\"},{\"name\":\"Manage Watchers\",\"id\":\"32\"}],\"name\":\"Voters & Watchers Permissions\"},{\"permissions\":[{\"name\":\"Add Comments\",\"id\":\"15\"},{\"name\":\"Edit All Comments\",\"id\":\"34\"},{\"name\":\"Edit Own Comments\",\"id\":\"35\"},{\"name\":\"Delete All Comments\",\"id\":\"36\"},{\"name\":\"Delete Own Comments\",\"id\":\"37\"}],\"name\":\"Comments Permissions\"},{\"permissions\":[{\"name\":\"Create Attachments\",\"id\":\"19\"},{\"name\":\"Delete All Attachments\",\"id\":\"38\"},{\"name\":\"Delete Own Attachments\",\"id\":\"39\"}],\"name\":\"Attachments Permissions\"},{\"permissions\":[{\"name\":\"Work On Issues\",\"id\":\"20\"},{\"name\":\"Edit Own Worklogs\",\"id\":\"40\"},{\"name\":\"Edit All Worklogs\",\"id\":\"41\"},{\"name\":\"Delete Own Worklogs\",\"id\":\"42\"},{\"name\":\"Delete All Worklogs\",\"id\":\"43\"}],\"name\":\"Time Tracking Permissions\"}]";
-WRM._unparsedData["com.atlassian.jira.plugins.jira-dnd-attachment-plugin:drag-and-drop-attachment-javascript.upload-limit"]="\"10485760\"";
-WRM._unparsedData["com.atlassian.plugins.atlassian-plugins-webresource-rest:web-resource-manager.resource-base-url-pattern"]="\"(?:/jira(?:/s/.*?/_)?/download)\"";
-WRM._unparsedData["com.atlassian.plugins.base-hipchat-integration-plugin:configure-integration-data.configure-integration"]="{\"inviteEnabled\":false}";
-WRM._unparsedData["com.atlassian.plugins.base-hipchat-integration-plugin:hipchat-installed-scopes.scopes"]="{}";
-WRM._unparsedData["com.atlassian.plugins.base-hipchat-integration-plugin:hipchat-user-link-support.user-link-context"]="{\"userLinked\":false,\"userHasManageRoomsScope\":false,\"beginOauth\":\"https://ci.open-paas.org/jira/rest/hipchat/integration/latest/oauth2/begin\"}";
-WRM._unparsedData["com.atlassian.plugins.base-hipchat-integration-plugin:integration-steps-resources.enable-invite"]="{\"inviteToHipChatEnabled\":true,\"isInvitationsToGroupAllowedURI\":\"https://ci.open-paas.org/jira/rest/hipchat/integration/latest/groups/default/invitations-allowed\"}";
-WRM._unparsedData["com.atlassian.plugins.browser.metrics.browser-metrics-plugin:api.feature-data-provider"]="true";
-WRM._unparsedData["com.atlassian.plugins.browser.metrics.browser-metrics-plugin:browser-metrics.feature-data-provider-legacy"]="true";
-WRM._unparsedData["com.atlassian.plugins.helptips.jira-help-tips:common.JiraHelpTipData"]="{\"dismissed\":[\"add.new.users\",\"automaticTransitionDevSummaryTooltip\",\"devstatus.cta.createbranch.tooltip\",\"hipchat.feature.discovery.tip\",\"notification-helper-helptip\",\"permission-helper-helptip\",\"sidebar-chaperone-collapse-tip\",\"sidebar-chaperone-disable-tip\",\"sidebar-chaperone-general-overview-tip\",\"split-view-intro\",\"view.all.issues\"],\"anonymous\":false}";
-WRM._unparsedData["com.atlassian.plugins.jira-html5-attach-images:jira-html5-attach-images-resources.resource-uris"]="{\"deployJava.html\":\"/jira/s/en_US-j84vrp/64020/3/1.5.27/_/download/resources/com.atlassian.plugins.jira-html5-attach-images:jira-html5-attach-images-resources/deployJava.html\",\"clipboard.jar\":\"/jira/s/en_US-j84vrp/64020/3/1.5.27/_/download/resources/com.atlassian.plugins.jira-html5-attach-images:jira-html5-attach-images-resources/clipboard.jar\",\"clipboard-legacy.jar\":\"/jira/s/en_US-j84vrp/64020/3/1.5.27/_/download/resources/com.atlassian.plugins.jira-html5-attach-images:jira-html5-attach-images-resources/clipboard-legacy.jar\"}";
-</script>
-<link type="text/css" rel="stylesheet" href="test_files/batch_002.css" media="all">
-<!--[if lte IE 9]>
-<link type="text/css" rel="stylesheet" href="/jira/s/4fc2450354ce7afde50f0e2acff5da33-CDN/en_US-j84vrp/64020/3/38/_/download/superbatch/css/batch.css?conditionalComment=lte+IE+9" media="all">
-<![endif]-->
-<link type="text/css" rel="stylesheet" href="test_files/batch.css" media="all">
-<link type="text/css" rel="stylesheet" href="test_files/com.css" media="all">
-<script type="text/javascript" src="test_files/batch_002.js"></script><style type="text/css">:root #header + #content > #left > #rlblock_left,
-:root #content > #right > .dose > .dosesingle,
-:root #content > #center > .dose > .dosesingle
-{display:none !important;}</style><style></style><style type="text/css"></style>
-<script type="text/javascript" src="test_files/batch.js"></script><style type="text/css"></style><style type="text/css"></style><link type="text/css" charset="ISO-8859-1" href="test_files/common.css" rel="stylesheet">
-<script type="text/javascript" src="test_files/com.js"></script>
-<script type="text/javascript" src="test_files/jira_002.js"></script>
-<script type="text/javascript" src="test_files/jira.js"></script>
-
-<script type="text/javascript" src="test_files/shortcuts.js"></script>
-
-
-
-    
-    
-    <meta name="decorator" content="atl.general">
-    <meta id="isNavigator" name="isNavigator" content="true">
-    <meta name="ajs-is-inline-edit-enabled" content="true">
-    <meta name="ajs-user.search.mode" content="basic">
-    <meta name="ajs-issue-search-help-title" content="Searching for Issues">
-    <meta name="ajs-issue-search-help-url" content="https://docs.atlassian.com/jira/docs-064/Searching+for+Issues">
-    <meta name="ajs-advanced-search-help-title" content="Performing Advanced Searches">
-    <meta name="ajs-advanced-search-help-url" content="https://docs.atlassian.com/jira/docs-064/Advanced+Searching">
-                <meta name="ajs-remote-user-avatar-url" content="https://ci.open-paas.org/jira/secure/useravatar?avatarId=10111">
-    
-    
-
-
-
-
-
-
-<meta name="ajs-can-search-users" content="true">
-<meta name="ajs-can-edit-watchers" content="true">
-<meta name="ajs-default-avatar-url" content="https://ci.open-paas.org/jira/secure/useravatar?size=xsmall&amp;avatarId=10123">
-<meta name="ajs-issue-key" content="OR-2349">
-<meta name="ajs-server-view-issue-is-editable" content="true">
-
-<title>[OR-2349] Docker-compose doesn't activate attachments and dwld/upld url are wrongly populated - OpenPaas-Linagora</title>
-<link rel="search" type="application/opensearchdescription+xml" href="https://ci.open-paas.org/jira/osd.jsp" title="[OR-2349] Docker-compose doesn't activate attachments and dwld/upld url are wrongly populated - OpenPaas-Linagora">
-
-
-<style>@media print {#UNIQUE_ID-ghostery {display:none !important}}</style></head>
-
-
-
-
-
-<body data-aui-version="5.7.27" id="jira" class="aui-layout aui-theme-default ka ajax-issue-search-and-view page-type-navigator navigator-issue-only" data-version="6.4.5">
-<div id="page">
-    <header id="header" role="banner">
-        
-    
-        
-            
-        
-    
-
-
-
-
-
-<script>
-    AJS.$(function () {
-        var licenseBanner = require("jira/license-banner");
-        licenseBanner.showLicenseBanner("");
-        licenseBanner.showLicenseFlag("");
-    });
-</script>
-
-
-
-
-
-
-
-        
-
-
-
-        
-
-
-
-<fieldset class="parameters hidden dont-default-focus">
-    <input title="tzdetect.pref.tzid" value="Europe/Paris" type="hidden">
-    <input title="tzdetect.pref.tzname" value="(GMT+01:00) Paris" type="hidden">
-    <input title="tzdetect.pref.janOffset" value="3600000" type="hidden">
-    <input title="tzdetect.pref.julyOffset" value="7200000" type="hidden">
-</fieldset>
-<nav data-aui-responsive="true" class="aui-header aui-dropdown2-trigger-group" role="navigation"><div class="aui-header-inner"><div class="aui-header-before"><a class=" aui-dropdown2-trigger app-switcher-trigger __skate" aria-owns="app-switcher" aria-controls="app-switcher" aria-haspopup="true" data-aui-trigger="" href="#app-switcher"><span class="aui-icon aui-icon-small aui-iconfont-appswitcher">Linked Applications</span></a><div id="app-switcher" class="aui-dropdown2 aui-style-default"><div class="aui-dropdown2-section"><ul class="nav-links"><li class="nav-link nav-link-local"><a href="https://ci.open-paas.org/jira/" class="aui-dropdown2-radio aui-dropdown2-checked" title="https://ci.open-paas.org/jira/"><span class="nav-link-label">OpenPaas-Linagora</span></a></li><li class="nav-link"><a href="https://ci.open-paas.org/stash/" class="aui-dropdown2-radio " title="https://ci.open-paas.org/stash/"><span class="nav-link-label">Stash - OpenPaas</span></a></li><li class="nav-link"><a href="https://ci.open-paas.org/jenkins/" class="aui-dropdown2-radio " title="https://ci.open-paas.org/jenkins/"><span class="nav-link-label">Jenkins - OpenPaas</span></a></li></ul></div><div class="aui-dropdown2-section"><ul class="nav-links"><li><a class="nav-link-edit-wrapper" href="https://ci.open-paas.org/jira/plugins/servlet/customize-application-navigator"><span class="nav-link-edit">Configure…</span></a></li></ul></div></div><script>
-            (function (NL) {
-                var initialise = function () {
-                    // For some milestones of AUI, the atlassian soy namespace was renamed to aui. Handle that here by ensuring that window.atlassian is defined.
-                    window.atlassian = window.atlassian || window.aui;
-                    new NL.AppSwitcher({
-                        dropdownContents: '#app-switcher'
-                    });
-                };
-                if (NL.AppSwitcher) {
-                    initialise();
-                } else {
-                    NL.onInit = initialise;
-                }
-            }(window.NL = (window.NL || {})));
-            window.NL.environment = {isUserAdmin: true, isAppSuggestionAvailable: false};</script></div><div class="aui-header-primary"><h1 id="logo" class="aui-header-logo aui-header-logo-custom"><a href="https://ci.open-paas.org/jira/secure/MyJiraHome.jspa"><img data-aui-responsive-header-index="0" src="test_files/icon-jira-logo.png" alt="OpenPaas-Linagora"></a></h1><ul style="width: auto;" class="aui-nav __skate">
-
-
-
-
-<li><a class="aui-nav-link aui-dropdown2-ajax jira-ajax-menu aui-dropdown2-trigger " href="https://ci.open-paas.org/jira/secure/Dashboard.jspa" id="home_link" accesskey="d" title="View and manage your dashboards" aria-haspopup="true" aria-owns="home_link-content">Dashboards</a><div id="home_link-content" class="aui-dropdown2 aui-style-default" data-aui-dropdown2-ajax-key="home_link"></div></li><li><a class="aui-nav-link aui-dropdown2-ajax jira-ajax-menu aui-dropdown2-trigger " href="https://ci.open-paas.org/jira/browse/OR" id="browse_link" accesskey="p" title="View recent projects and browse a list of projects" aria-haspopup="true" aria-owns="browse_link-content">Projects</a><div id="browse_link-content" class="aui-dropdown2 aui-style-default" data-aui-dropdown2-ajax-key="browse_link"></div></li><li><a class="aui-nav-link aui-dropdown2-ajax jira-ajax-menu aui-dropdown2-trigger " href="https://ci.open-paas.org/jira/issues/" id="find_link" accesskey="i" title="Search for issues and view recent issues" aria-haspopup="true" aria-owns="find_link-content">Issues</a><div id="find_link-content" class="aui-dropdown2 aui-style-default" data-aui-dropdown2-ajax-key="find_link"></div></li><li><a class="aui-nav-link aui-dropdown2-ajax jira-ajax-menu aui-dropdown2-trigger " href="https://ci.open-paas.org/jira/secure/GreenHopper.jspa" id="greenhopper_menu" title="Manage your project with JIRA Agile" aria-haspopup="true" aria-owns="greenhopper_menu-content">Agile</a><div id="greenhopper_menu-content" class="aui-dropdown2 aui-style-default" data-aui-dropdown2-ajax-key="greenhopper_menu"></div></li>
-<li style="display: none;"><a id="aui-responsive-header-dropdown-trigger-0" class=" aui-dropdown2-trigger __skate" aria-owns="aui-responsive-header-dropdown-content-0" aria-controls="aui-responsive-header-dropdown-content-0" aria-haspopup="true" data-aui-trigger="" href="#">More<span class="icon aui-icon-dropdown"></span></a><div id="aui-responsive-header-dropdown-content-0" class="aui-dropdown2 aui-style-default"><div class="aui-dropdown2-section"><ul id="aui-responsive-header-dropdown-list-0"></ul></div></div></li><li id="create-menu"><a id="create_link" class="aui-button aui-button-primary aui-style create-issue " title="Create a new issue / bug / feature request / etc ( Type 'c' )" href="https://ci.open-paas.org/jira/secure/CreateIssue%21default.jspa" accesskey="c">Create</a></li></ul></div><div class="aui-header-secondary"><ul class="aui-nav __skate"><li>
-    <form action="/jira/secure/QuickSearch.jspa" method="get" id="quicksearch" class="aui-quicksearch dont-default-focus ajs-dirty-warning-exempt">
-        <input id="quickSearchInput" class="search" title="Search ( Type '/' )" placeholder="Search" name="searchString" accesskey="q" type="text">
-        <input class="hidden" value="Search" type="submit">
-    </form>
-</li>
-
-
-
-    <li id="system-help-menu">
-        <a class="aui-nav-link aui-dropdown2-trigger" id="help_menu" aria-haspopup="true" aria-owns="system-help-menu-content" href="https://docs.atlassian.com/jira/docs-064/JIRA+Documentation" target="$textUtils.htmlEncode($rootHelpMenuItem.params.target)" title="Help"><span class="aui-icon aui-icon-small aui-iconfont-help">Help</span></a>
-        <div id="system-help-menu-content" class="aui-dropdown2 aui-style-default">
-                            <div class="aui-dropdown2-section">
-                                                                <ul id="jira-help" class="aui-list-truncate">
-                                                            <li>
-                                    <a id="view_help" class="" title="Goto the online documentation for JIRA" href="https://docs.atlassian.com/jira/docs-064/JIRA+Documentation" target="_blank">Online Help</a>
-                                </li>
-                                                            <li>
-                                    <a id="gh_view_help" class="" title="Get help online for JIRA Agile" href="http://docs.atlassian.com/agile/docs-067/JIRA+Agile+Documentation" target="_blank">JIRA Agile Help</a>
-                                </li>
-                                                            <li>
-                                    <a id="keyshortscuthelp" class="" title="Get more information about JIRA's Keyboard Shortcuts ( Type '?' )" href="https://ci.open-paas.org/jira/secure/ViewKeyboardShortcuts%21default.jspa" target="_blank">Keyboard Shortcuts</a>
-                                </li>
-                                                            <li>
-                                    <a id="view_about" class="" title="Get more information about JIRA" href="https://ci.open-paas.org/jira/secure/AboutPage.jspa">About JIRA</a>
-                                </li>
-                                                            <li>
-                                    <a id="view_credits" class="" title="See who did what" href="https://ci.open-paas.org/jira/secure/JiraCreditsPage%21default.jspa" target="_blank">JIRA Credits</a>
-                                </li>
-                                                    </ul>
-                                    </div>
-                    </div>
-    </li>
-
-
-<li id="system-admin-menu">
-    <a href="https://ci.open-paas.org/jira/secure/project/ViewProjects.jspa" id="admin_menu" class="aui-nav-link aui-dropdown2-trigger" aria-haspopup="true" aria-owns="system-admin-menu-content" title="Administration"><span class="aui-icon aui-icon-small aui-iconfont-configure">Administration</span></a>
-    <div id="system-admin-menu-content" class="aui-dropdown2 aui-style-default">
-                    <div class="aui-dropdown2-section">
-                <strong>JIRA administration</strong>
-                <ul class="aui-list-truncate">
-                                            <li>
-                            <a href="https://ci.open-paas.org/jira/secure/project/ViewProjects.jspa" class="aui-nav-link" id="admin_project_menu">Projects</a>
-                        </li>
-                                            <li>
-                            <a href="https://ci.open-paas.org/jira/secure/admin/ViewIssueTypes.jspa" class="aui-nav-link" id="admin_issues_menu">Issues</a>
-                        </li>
-                                            <li>
-                            <a href="https://ci.open-paas.org/jira/secure/admin/user/UserBrowser.jspa" class="aui-nav-link" id="admin_users_menu">User management</a>
-                        </li>
-                                            <li>
-                            <a href="https://ci.open-paas.org/jira/secure/admin/ViewApplicationProperties.jspa" class="aui-nav-link" id="admin_system_menu">System</a>
-                        </li>
-                                            <li>
-                            <a href="https://ci.open-paas.org/jira/plugins/servlet/upm/marketplace" class="aui-nav-link" id="admin_plugins_menu">Add-ons</a>
-                        </li>
-                                    </ul>
-            </div>
-            </div>
-</li>
-
-
-
-
-
-
-
-
-<li id="user-options">
-            <a id="header-details-user-fullname" class="aui-dropdown2-trigger" aria-haspopup="true" aria-owns="user-options-content" data-username="scolson" data-displayname="Stephane COLSON" href="https://ci.open-paas.org/jira/secure/ViewProfile.jspa" title="User profile for Stephane COLSON">
-            <span class="aui-avatar aui-avatar-small">
-                <span class="aui-avatar-inner">
-                    <img src="test_files/useravatar.png" alt="User profile for Stephane COLSON">
-                </span>
-            </span>
-        </a>
-                <div id="user-options-content" class="aui-dropdown2 aui-style-default">
-                            <div class="aui-dropdown2-section">
-                                                                <ul id="personal" class="aui-list-truncate">
-                                                                                                <li>
-                                        <a id="view_profile" class="" title="View and change your details and preferences" href="https://ci.open-paas.org/jira/secure/ViewProfile.jspa">Profile</a>
-                                    </li>
-                                                                                                                                <li>
-                                        <a id="upm-requests-link" class="" href="https://ci.open-paas.org/jira/plugins/servlet/upm/requests?source=header_user">Atlassian Marketplace</a>
-                                    </li>
-                                                                                    </ul>
-                                    </div>
-                            <div class="aui-dropdown2-section">
-                                            <strong>My JIRA Home</strong>
-                                                                <ul id="set_my_jira_home" class="aui-list-truncate">
-                                                            
-                                                                        <li>
-                                        <a id="set_my_jira_home_default" class="aui-dropdown2-radio interactive checked    " title="Set my JIRA Home to the Dashboard." href="https://ci.open-paas.org/jira/secure/UpdateMyJiraHome.jspa?target=com.atlassian.jira.jira-my-home-plugin%3Aset_my_jira_home_dashboard&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin">Dashboard</a>
-                                    </li>
-                                                                                            
-                                                                        <li>
-                                        <a id="greenhopper-my-jira-home-set" class="aui-dropdown2-radio interactive    " title="Set my JIRA Home to Agile." href="https://ci.open-paas.org/jira/secure/UpdateMyJiraHome.jspa?target=com.pyxis.greenhopper.jira%3Agreenhopper-my-jira-home-set-51&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin">Agile</a>
-                                    </li>
-                                                                                            
-                                                                        <li>
-                                        <a id="set_my_jira_home_issuenav" class="aui-dropdown2-radio interactive    " title="Set my JIRA Home to the Issue Navigator." href="https://ci.open-paas.org/jira/secure/UpdateMyJiraHome.jspa?target=com.atlassian.jira.jira-my-home-plugin%3Aset_my_jira_home_issue&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin">Issue Navigator</a>
-                                    </li>
-                                                                                    </ul>
-                                    </div>
-                            <div class="aui-dropdown2-section">
-                                                                <ul id="system" class="aui-list-truncate">
-                                                                                                <li>
-                                        <a class="project-centric-nav-user-option disable-project-centric-nav" href="https://ci.open-paas.org/jira">Disable new project navigation</a>
-                                    </li>
-                                                                                                                                <li>
-                                        <a id="log_out" class="" title="Log out and cancel any automatic login." href="https://ci.open-paas.org/jira/logout?atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin">Log Out</a>
-                                    </li>
-                                                                                    </ul>
-                                    </div>
-                    </div>
-    </li>
-</ul></div></div><!-- .aui-header-inner--></nav><!-- .aui-header -->
-    </header>
-    
-
-
-
-    <section id="content" role="main">
-
-    
-
-    <div class="issue-container ">
-                                    <div id="issue-content" class="issue-edit-form">
-                    <header style="" id="stalker" class="issue-header js-stalker">
-                        <div class="issue-header-content"><header class="aui-page-header"><div class="aui-page-header-inner"><div class="aui-page-header-image"><span id="10100" class="aui-avatar aui-avatar-large aui-avatar-project jira-system-avatar"><span class="aui-avatar-inner"><img id="project-avatar" alt="Uploaded image for project: 'OpenPaaS RSE'" src="test_files/projectavatar.png"></span></span></div><!-- .aui-page-header-image --><div class="aui-page-header-main"><ol class="aui-nav aui-nav-breadcrumbs __skate"><li><a id="project-name-val" href="https://ci.open-paas.org/jira/browse/OR">OpenPaaS RSE</a></li><li><a class="issue-link" data-issue-key="OR-2349" href="https://ci.open-paas.org/jira/browse/OR-2349" id="key-val" rel="16626">OR-2349</a></li></ol><h1 title="Click to edit" class="editable-field inactive" id="summary-val">Docker-compose doesn't activate attachments and dwld/upld url are wrongly populated<span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></h1></div><!-- .aui-page-header-main --><div class="aui-page-header-actions"><div id="issue-header-pager"></div></div><!-- .aui-page-header-actions --></div><!-- .aui-page-header-inner --></header><!-- .aui-page-header --><div class="command-bar"><div class="ops-cont"><div class="ops-menus aui-toolbar"><div class="toolbar-split toolbar-split-left"><ul id="opsbar-edit-issue_container" class="toolbar-group pluggable-ops"><li class="toolbar-item"><a id="edit-issue" title=" ( Type 'e' )" class="toolbar-trigger issueaction-edit-issue" href="https://ci.open-paas.org/jira/secure/EditIssue%21default.jspa?id=16626"><span class="icon aui-icon aui-icon-small aui-iconfont-edit"></span> <span class="trigger-label">Edit</span></a></li></ul><ul id="opsbar-comment-issue_container" class="toolbar-group pluggable-ops"><li class="toolbar-item"><a id="comment-issue" title="Comment on this issue" class="toolbar-trigger issueaction-comment-issue add-issue-comment inline-comment" href="https://ci.open-paas.org/jira/secure/AddComment%21default.jspa?id=16626"><span class="icon aui-icon aui-icon-small aui-iconfont-comment icon-comment"></span> <span class="trigger-label">Comment</span></a></li></ul><ul id="opsbar-opsbar-operations" class="toolbar-group pluggable-ops"><li class="toolbar-item"><a id="assign-issue" title=" ( Type 'a' )" class="toolbar-trigger issueaction-assign-issue" href="https://ci.open-paas.org/jira/secure/AssignIssue%21default.jspa?id=16626"><span class="trigger-label">Assign</span></a></li><li class="toolbar-item toolbar-dropdown"><div><a href="#" id="opsbar-operations_more" data-hide-on-scroll=".split-view .issue-container" data-contain-to-window="true" class="toolbar-trigger  js-default-dropdown"><span class="dropdown-text">More</span><span class="icon drop-menu"></span></a><div class="aui-list hidden"><ul class="aui-list-section aui-first"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/GHGoToBoard.jspa?issueId=16626" class="aui-list-item-link issueaction-greenhopper-rapidboard-operation js-rapidboard-operation-issue" title="View this issue on an Agile board" id="greenhopper-rapidboard-operation"><span class="trigger-label">Agile Board</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/RankTop.jspa?issueId=16626" class="aui-list-item-link issueaction-greenhopper-rank-top-operation" id="greenhopper-rank-top-operation"><span class="trigger-label">Rank to Top</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/RankBottom.jspa?issueId=16626" class="aui-list-item-link issueaction-greenhopper-rank-bottom-operation" id="greenhopper-rank-bottom-operation"><span class="trigger-label">Rank to Bottom</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/CreateWorklog%21default.jspa?id=16626" class="aui-list-item-link issueaction-log-work" title="Log work against this issue" id="log-work"><span class="trigger-label">Log Work</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/AttachFile%21default.jspa?id=16626" class="aui-list-item-link issueaction-attach-file" title="Attach one or more files to this issue" id="attach-file"><span class="trigger-label">Attach Files</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/ShowAttachScreenshotFormAction%21default.jspa?id=16626" class="aui-list-item-link issueaction-attach-screenshot-html5" id="attach-screenshot-html5"><span class="trigger-label">Attach Screenshot</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/editDrawioDiagram.jspa?issueKey=OR-2349" class="aui-list-item-link" id="com.mxgraph.jira.plugins.drawio:drawio-add-menu-item"><span class="trigger-label">Add Drawio Diagram</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/ViewVoters%21default.jspa?id=16626" class="aui-list-item-link issueaction-view-voters" title="View voters for this issue" id="view-voters"><span class="trigger-label">Voters</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/VoteOrWatchIssue.jspa?atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin&amp;id=16626&amp;watch=unwatch" class="aui-list-item-link issueaction-unwatch-issue" title="Stop watching this issue" id="toggle-watch-issue"><span class="trigger-label">Stop Watching</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/ManageWatchers%21default.jspa?id=16626" class="aui-list-item-link issueaction-manage-watchers" title="Manage the watchers of this issue" id="manage-watchers"><span class="trigger-label">Watchers</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/CreateSubTaskIssue%21default.jspa?parentIssueId=16626" class="aui-list-item-link issueaction-create-subtask" title="Create sub-task for this issue" id="create-subtask"><span class="trigger-label">Create Sub-Task</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/ConvertIssue.jspa?id=16626" class="aui-list-item-link issueaction-issue-to-subtask" title="Convert this issue to sub-task" id="issue-to-subtask"><span class="trigger-label">Convert to Sub-Task</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="#devstatus.cta.createbranch" class="aui-list-item-link devstatus-cta-link" id="cta-create-branch"><span class="trigger-label">Create branch</span></a></li></ul><ul class="aui-list-section"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/MoveIssue%21default.jspa?id=16626" class="aui-list-item-link issueaction-move-issue" title="Move this issue to another project or issue type." id="move-issue"><span class="trigger-label">Move</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/LinkJiraIssue%21default.jspa?id=16626" class="aui-list-item-link issueaction-link-issue" title="Link this issue to another issue or item" id="link-issue"><span class="trigger-label">Link</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/CloneIssueDetails%21default.jspa?id=16626" class="aui-list-item-link issueaction-clone-issue" title="Clone this issue" id="clone-issue"><span class="trigger-label">Clone</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/EditLabels%21default.jspa?id=16626" class="aui-list-item-link issueaction-edit-labels" title=" ( Type 'l' )" id="edit-labels"><span class="trigger-label">Labels</span></a></li></ul><ul class="aui-list-section aui-last"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/DeleteIssue%21default.jspa?id=16626" class="aui-list-item-link issueaction-delete-issue" title="Delete this issue" id="delete-issue"><span class="trigger-label">Delete</span></a></li></ul></div></div></li></ul><ul id="opsbar-opsbar-transitions" class="toolbar-group pluggable-ops"><li class="toolbar-item"><a id="action_id_301" class="toolbar-trigger issueaction-workflow-transition" href="https://ci.open-paas.org/jira/secure/WorkflowUIDispatcher.jspa?id=16626&amp;action=301&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin"><span class="trigger-label">Stop Progress</span></a></li><li class="toolbar-item"><a id="action_id_5" class="toolbar-trigger issueaction-workflow-transition" href="https://ci.open-paas.org/jira/secure/WorkflowUIDispatcher.jspa?id=16626&amp;action=5&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin"><span class="trigger-label">Resolve Issue</span></a></li><li class="toolbar-item"><a id="action_id_2" class="toolbar-trigger issueaction-workflow-transition" href="https://ci.open-paas.org/jira/secure/WorkflowUIDispatcher.jspa?id=16626&amp;action=2&amp;atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin"><span class="trigger-label">Close Issue</span></a></li></ul><ul id="opsbar-opsbar-admin" class="toolbar-group pluggable-ops"><li class="toolbar-item toolbar-dropdown"><div><a href="#" id="opsbar-admin_more" data-hide-on-scroll=".split-view .issue-container" data-contain-to-window="true" class="toolbar-trigger  js-default-dropdown"><span class="dropdown-text">Admin</span><span class="icon drop-menu"></span></a><div class="aui-list hidden"><ul class="aui-list-section aui-first"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/secure/admin/ViewCustomFields.jspa" class="aui-list-item-link issueaction-fields-add" title="Add a field and to the current issue's screens." id="com.atlassian.jira.jira-project-config-plugin:add-custom-field"><span class="trigger-label">Add field</span></a></li></ul><ul class="aui-list-section aui-last"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/notimportant" class="aui-list-item-link whereismycf-trigger" title="Where is my field?" id="jira-operations-whereismycf-trigger"><span class="trigger-label">Where is my field?</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/notimportant" class="aui-list-item-link permissionhelper-trigger" title="Discover why a user does or does not have certain permissions" id="jira-operations-permissionhelper-trigger"><span class="trigger-label">Permission Helper</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/notimportant" class="aui-list-item-link notificationhelper-trigger" title="Find out why users receive, or do not receive notifications for this issue" id="jira-operations-notificationhelper-trigger"><span class="trigger-label">Notification Helper</span></a></li></ul></div></div></li></ul></div><div class="toolbar-split toolbar-split-right"><ul id="opsbar-jira.issue.tools" class="toolbar-group pluggable-ops"><li class="toolbar-item"><a original-title="Share this issue by emailing other users" id="jira-share-trigger" class="toolbar-trigger viewissue-share" href="https://ci.open-paas.org/jira"><span class="icon aui-icon aui-icon-small aui-iconfont-share"></span> <span class="trigger-label"></span></a></li><li class="toolbar-item toolbar-dropdown"><div><a original-title="Export this issue in another format" href="#" id="viewissue-export" data-hide-on-scroll=".split-view .issue-container" data-contain-to-window="true" class="toolbar-trigger  js-default-dropdown"><span class="icon icon-default aui-icon aui-icon-small aui-iconfont-export"></span> <span class="dropdown-text">Export</span><span class="icon drop-menu"></span></a><div class="aui-list hidden"><ul class="aui-list-section aui-first aui-last"><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/si/jira.issueviews:issue-xml/OR-2349/OR-2349.xml" class="aui-list-item-link" id="jira.issueviews:issue-xml"><span class="trigger-label">XML</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/si/jira.issueviews:issue-word/OR-2349/OR-2349.doc" class="aui-list-item-link" id="jira.issueviews:issue-word"><span class="trigger-label">Word</span></a></li><li class="aui-list-item"><a href="https://ci.open-paas.org/jira/si/jira.issueviews:issue-html/OR-2349/OR-2349.html" class="aui-list-item-link" id="jira.issueviews:issue-html"><span class="trigger-label">Printable</span></a></li></ul></div></div></li></ul></div></div></div></div></div>
-                    </header>
-                    <div class="issue-body-content">
-                        <div class="aui-group issue-body"><div class="aui-item issue-main-column"><div id="details-module" class="module toggle-wrap"><div id="details-module_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Details</h2></div><div class="mod-content">
-
-
-
-
-<ul id="issuedetails" class="property-list two-cols">
-    <li class="item">
-        <div class="wrap">
-            <strong class="name">Type:</strong>
-            <span title="Click to edit" id="type-val" class="value editable-field inactive">
-                                <img alt="" src="test_files/bug.png" title="Bug - A problem which impairs or prevents the functions of the product." height="16" width="16"> Bug
-            <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-        </div>
-    </li>
-    <li class="item item-right">
-        <div class="wrap">
-            <strong class="name">Status:</strong>
-            <span id="status-val" class="value">
-                                <span original-title="" class=" jira-issue-status-lozenge aui-lozenge jira-issue-status-lozenge-yellow jira-issue-status-lozenge-indeterminate jira-issue-status-lozenge-max-width-medium" data-tooltip="&lt;span class=&quot;jira-issue-status-tooltip-title&quot;&gt;Progressing&lt;/span&gt;&lt;br&gt;&lt;span class=&quot;jira-issue-status-tooltip-desc&quot;&gt;This issue is being actively worked on at the moment by the assignee.&lt;/span&gt;">Progressing</span>            </span>
-                            <span class="status-view">(<a class="issueaction-viewworkflow new-workflow-designer" href="https://ci.open-paas.org/jira/browse/OR-2349?workflowName=jira&amp;stepId=3">View Workflow</a>)</span>
-                    </div>
-    </li>
-            <li class="item">
-            <div class="wrap">
-                <strong class="name">Priority:</strong>
-                <span title="Click to edit" id="priority-val" class="value editable-field inactive">
-                                        <img alt="" src="test_files/major.png" title="Major - Major loss of function." height="16" width="16"> Major
-                <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-            </div>
-        </li>
-                                <li class="item item-right">
-            <div class="wrap">
-                <strong class="name">Resolution:</strong>
-                <span id="resolution-val" class="value unresolved">
-                                    Unresolved
-                                </span>
-            </div>
-        </li>
-                <li class="item">
-            <div class="wrap">
-                <strong class="name">Affects Version/s:</strong>
-                <span title="Click to edit" id="versions-val" class="value editable-field inactive">
-                                            None
-                                    <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-            </div>
-        </li>
-                <li class="item item-right">
-            <div class="wrap">
-                <strong class="name">Fix Version/s:</strong>
-                <span title="Click to edit" id="fixfor-val" class="value editable-field inactive">
-                                            None
-                                    <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-            </div>
-        </li>
-                <li class="item">
-            <div class="wrap">
-                <strong class="name">Component/s:</strong>
-                <span title="Click to edit" id="components-val" class="value editable-field inactive">
-                                            None
-                                    <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-            </div>
-        </li>
-                    <li class="item full-width">
-            <div class="wrap" id="wrap-labels">
-                <strong class="name">Labels:</strong>
-                    <div title="Click to edit" class="labels-wrap value editable-field inactive">
-            <span class="labels" id="labels-16626-value">None</span>
-                                <a title="Follow link" class="aui-icon aui-icon-small aui-iconfont-edit edit-labels" id="edit-labels-16626-labels" href="https://ci.open-paas.org/jira/secure/EditLabels%21default.jspa?id=16626&amp;noLink=false"><span>Labels</span></a>
-                <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></div>
-            </div>
-        </li>
-        </ul>
-
-<div id="customfieldmodule">
-    <div role="application" class="aui-tabs horizontal-tabs" id="customfield-tabs">
-                    <div aria-hidden="false" role="tabpanel" id="customfield-panel-1" class="tabs-pane active-pane">
-                        <ul class="property-list">
-                                                <li id="rowForcustomfield_10004" class="item">
-                        <div class="wrap">
-                            <strong title="Rank (Obsolete)" class="name">Rank (Obsolete):</strong>
-                            <div id="customfield_10004-val" class="value type-gh-global-rank" data-fieldtype="gh-global-rank" data-fieldtypecompletekey="com.pyxis.greenhopper.jira:gh-global-rank">
-                                      9223372036854775807
-  
-                            </div>
-                        </div>
-                    </li>
-                                                                <li id="rowForcustomfield_10201" class="item">
-                        <div class="wrap">
-                            <strong title="Acceptance Criteria" class="name">Acceptance Criteria:</strong>
-                            <div title="Click to edit" id="customfield_10201-val" class="value type-checklist editable-field inactive" data-fieldtype="checklist" data-fieldtypecompletekey="com.okapya.jira.checklist:checklist">
-                                    <div id="o-checklist-view-10201" class="o-checklist">
-        <div style="max-width: 800px;">
-                           <div class="o-checklist-header"><div><span class="o-icon-check"></span>0/1<div class="o-view-actions o-pull-right"><a title="Follow link" class="o-checked-filter" href="#"><span class="o-hide">Hide checked</span><span class="o-show">Show checked</span></a></div></div></div>
-                                        <div class="o-checklist-items o-read-only"><div class="o-checklist-item"><div class="o-checkbox"><span class="o-icon-ok-1"></span></div><div class="o-checklist-item-details"><p>Tested</p></div></div></div>
-                <div class="o-checklist-items-collapsible o-read-only"></div>
-                <a title="Follow link" class="o-show-items o-show-all">
-                    <span class="o-more"><span class="o-icon-down-open"></span>show more</span>
-                    <span class="o-less"><span class="o-icon-up-open"></span>show less</span>
-                </a>
-                    </div>
-    </div>
-    <form id="parameterContainer">
-        <fieldset class="hidden parameters">
-            <input title="okapya.close" value="Close" type="hidden">
-            <input title="okapya.import.error" value="Checklist believes that you are trying to import data to recreate items from a different list and found the following error:" type="hidden">
-        </fieldset>
-    </form>
-
-                            <script>
-            if (!okapya.checklists.hasOwnProperty("o-checklist-view-10201")) {
-                okapya.checklists["o-checklist-view-10201"] = okapya.createChecklistView({"id" : "10201", "customfieldId": "customfield_10201", "parameters": {"strikeThrough":true,"showMoreCount":2,"discretionaryOptionIds":[],"emphasizeMandatory":false,"version":1,"reporterCanEdit":true,"showStatusMenu":false,"editRoleIds":[]}}, [{"checked":false,"name":"Tested","mandatory":true,"rank":0,"optionId":10100,"version":"3.0","id":10100,"statusId":"none"}]);
-            } else {
-                okapya.checklists["o-checklist-view-10201"].registerData([{"checked":false,"name":"Tested","mandatory":true,"rank":0,"optionId":10100,"version":"3.0","id":10100,"statusId":"none"}]);
-            }
-        </script>
-        <input id="o-checklist-view-10201-data" value="[{&quot;checked&quot;:false,&quot;name&quot;:&quot;Tested&quot;,&quot;mandatory&quot;:true,&quot;rank&quot;:0,&quot;optionId&quot;:10100,&quot;version&quot;:&quot;3.0&quot;,&quot;id&quot;:10100,&quot;statusId&quot;:&quot;none&quot;}]" hidden="">
-    
-                            <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></div>
-                        </div>
-                    </li>
-                                        </ul>
-        </div>
-        </div></div>
-</div></div><div id="descriptionmodule" class="module toggle-wrap"><div id="descriptionmodule_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Description</h2></div><div class="mod-content"><div title="Click to edit" id="description-val" class="field-ignore-highlight editable-field inactive">
-    <div class="user-content-block">
-                    <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">               {
-                    <span class="code-quote">"name"</span> : <span class="code-quote">"uploadUrl"</span>,
-                    <span class="code-quote">"value"</span> : <span class="code-quote">"http:<span class="code-comment">//10.69.0.163:1080/jmap/upload"</span>,
-</span>                    <span class="code-quote">"_id"</span> : ObjectId(<span class="code-quote">"5785f85cd7f4033c00fc606d"</span>)
-                }, 
-                {
-                    <span class="code-quote">"name"</span> : <span class="code-quote">"downloadUrl"</span>,
-                    <span class="code-quote">"value"</span> : <span class="code-quote">"http:<span class="code-comment">//10.69.0.163:1080/jmap/download"</span>,
-</span>                    <span class="code-quote">"_id"</span> : ObjectId(<span class="code-quote">"5785f85cd7f4033c00fc606c"</span>)
-                }, 
-</pre>
-</div></div>
-
-<p>should be replaced with </p>
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">              {
-                    <span class="code-quote">"name"</span> : <span class="code-quote">"uploadUrl"</span>,
-                    <span class="code-quote">"value"</span> : <span class="code-quote">"http:<span class="code-comment">//10.69.0.163:1080/upload"</span>,
-</span>                    <span class="code-quote">"_id"</span> : ObjectId(<span class="code-quote">"5785f85cd7f4033c00fc606d"</span>)
-                }, 
-                {
-                    <span class="code-quote">"name"</span> : <span class="code-quote">"downloadUrl"</span>,
-                    <span class="code-quote">"value"</span> : <span class="code-quote">"http:<span class="code-comment">//10.69.0.163:1080/download"</span>,
-</span>                    <span class="code-quote">"_id"</span> : ObjectId(<span class="code-quote">"5785f85cd7f4033c00fc606c"</span>)
-                }, 
-               {
-                   <span class="code-quote">"name"</span> : <span class="code-quote">"composer.attachments"</span>,
-                    <span class="code-quote">"value"</span> : <span class="code-keyword">true</span>
-               }
-
-</pre>
-</div></div>
-            </div>
-<span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></div>
-</div></div><div id="activitymodule" class="module toggle-wrap"><div id="activitymodule_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Activity</h2></div><div class="mod-content">
-
-
-
-
-
-
-
-
-
-
-    <div class="tabwrap tabs2">
-
-        <ul id="issue-tabs" class="tabs horizontal">
-                                
-            <li data-id="all-tabpanel" data-key="com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel" data-label="All" data-href="/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel">
-                            <a class="ajax-activity-content" id="all-tabpanel" href="https://ci.open-paas.org/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel"><strong>All</strong></a>
-                        </li>
-                                
-            <li class="active" id="comment-tabpanel" data-id="comment-tabpanel" data-key="com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel" data-label="Comments" data-href="/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel">
-                            <strong tabindex="0">Comments</strong>
-                        </li>
-                                
-            <li data-id="worklog-tabpanel" data-key="com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel" data-label="Work Log" data-href="/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel">
-                            <a class="ajax-activity-content" id="worklog-tabpanel" href="https://ci.open-paas.org/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel"><strong>Work Log</strong></a>
-                        </li>
-                                
-            <li data-id="changehistory-tabpanel" data-key="com.atlassian.jira.plugin.system.issuetabpanels:changehistory-tabpanel" data-label="History" data-href="/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:changehistory-tabpanel">
-                            <a class="ajax-activity-content" id="changehistory-tabpanel" href="https://ci.open-paas.org/jira/browse/OR-2349?page=com.atlassian.jira.plugin.system.issuetabpanels:changehistory-tabpanel"><strong>History</strong></a>
-                        </li>
-                                
-            <li data-id="activity-stream-issue-tab" data-key="com.atlassian.streams.streams-jira-plugin:activity-stream-issue-tab" data-label="Activity" data-href="/jira/browse/OR-2349?page=com.atlassian.streams.streams-jira-plugin:activity-stream-issue-tab">
-                            <a class="ajax-activity-content" id="activity-stream-issue-tab" href="https://ci.open-paas.org/jira/browse/OR-2349?page=com.atlassian.streams.streams-jira-plugin:activity-stream-issue-tab"><strong>Activity</strong></a>
-                        </li>
-                </ul>
-
-            </div>
-    <div class="issuePanelWrapper">
-        <div class="issuePanelProgress"></div>
-        <div class="issuePanelContainer" id="issue_actions_container">
-                                    <div class="message-container">
-    There are no comments yet on this issue.
-</div>                             </div>
-    </div>
-</div></div><div id="addcomment" class="module">
-    <div id="addcomment" class="module">
-    <div class="mod-content">
-        <form action="/jira/secure/AddComment.jspa?atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin" class="aui top-label ajs-dirty-warning-exempt" id="issue-comment-add" method="post">
-            <div class="form-body">
-                <div class="hidden">
-                    <input name="atl_token" value="BE2F-79PL-H8QS-2STB|99bf85b35fda4cb18ee69314eef5a1392be0a3d3|lin" type="hidden">
-                    <input name="id" value="16626" type="hidden">
-                </div>
-
-                
-
-
-    
-            
-                
-    
-    
-                            <div class="field-group aui-field-wikiedit comment-input">
-                                                                        <label for="comment">Comment</label>
-                
-<div class="wiki-edit">
-    <div id="wiki-edit-dropdown2-text-style-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-dropdown"><div class="aui-dropdown2-section"><ul class="aui-list-truncate"><li><a original-title="Paragraph" href="#" class="wiki-edit-operation" data-operation="paragraph">Paragraph</a></li><li><a original-title="Heading 1" href="#" class="wiki-edit-operation wiki-edit-operation-h1" data-operation="h1">Heading 1</a></li><li><a original-title="Heading 2" href="#" class="wiki-edit-operation wiki-edit-operation-h2" data-operation="h2">Heading 2</a></li><li><a original-title="Heading 3" href="#" class="wiki-edit-operation wiki-edit-operation-h3" data-operation="h3">Heading 3</a></li><li><a original-title="Heading 4" href="#" class="wiki-edit-operation wiki-edit-operation-h4" data-operation="h4">Heading 4</a></li><li><a original-title="Heading 5" href="#" class="wiki-edit-operation wiki-edit-operation-h5" data-operation="h5">Heading 5</a></li><li><a original-title="Heading 6" href="#" class="wiki-edit-operation wiki-edit-operation-h6" data-operation="h6">Heading 6</a></li><li><a original-title="Preformatted" href="#" class="wiki-edit-operation wiki-edit-operation-monospace" data-operation="monospace">Preformatted</a></li><li><a original-title="Paragraph quote" href="#" class="wiki-edit-operation" data-operation="paragraph-quote">Paragraph quote</a></li><li><a original-title="Block quote" href="#" class="wiki-edit-operation" data-operation="block-quote">Block quote</a></li></ul></div></div><div id="wiki-edit-dropdown2-more-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-dropdown"><div class="aui-dropdown2-section"><ul class="aui-list-truncate"><li><a original-title="Strikethrough (Ctrl+Shift+S)" href="#" class="wiki-edit-operation" data-operation="delete" data-shortcut="ctrl+shift+s, command+shift+s">Strikethrough</a></li><li><a href="#" class="wiki-edit-operation" data-operation="superscript">Superscript</a></li><li><a href="#" class="wiki-edit-operation" data-operation="subscript">Subscript</a></li><li><a href="#" class="wiki-edit-operation" data-operation="cite">Citation</a></li></ul></div></div><div id="wiki-edit-dropdown2-link-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-dropdown wiki-edit-dropdown-link"><div class="aui-dropdown2-section"><ul class="aui-list-truncate"><li><a original-title="External link (Ctrl+K)" href="#" class="wiki-edit-operation" data-operation="link" data-shortcut="ctrl+k, command+k">External link</a></li><li><a href="#" class="wiki-edit-operation" data-operation="link-mail">Mail link</a></li><li><a href="#" class="wiki-edit-operation" data-operation="link-anchor">Anchor link</a></li><li><a href="#" class="wiki-edit-operation" data-operation="link-attachment">Attachment link</a></li></ul></div><div class="aui-dropdown2-section wiki-edit-insert-link"><strong>Attachment link</strong><ul class="aui-list-truncate"><li><a href="#"></a></li></ul></div></div><div id="wiki-edit-dropdown2-image-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-dropdown wiki-edit-dropdown-image"><div class="aui-dropdown2-section"><ul class="aui-list-truncate"><li><a original-title="External image" href="#" class="wiki-edit-operation" data-operation="image">External image</a></li><li><a href="#" class="wiki-edit-operation" data-operation="image-attachment">Attached image</a></li></ul></div><div class="aui-dropdown2-section wiki-edit-insert-image"><strong>Attached image</strong><ul class="aui-list-truncate"><li><a href="#"></a></li></ul></div></div><div id="wiki-edit-color-picker-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-picker wiki-edit-color-picker" data-container="wiki-edit-color-picker-buttons-wikiEdit0"><div class="aui-dropdown2-section"><ul><li><a href="#" style="background-color: #333333" data-operation="color" data-color="#333333">&nbsp;</a></li><li><a href="#" style="background-color: #707070" data-operation="color" data-color="#707070">&nbsp;</a></li><li><a href="#" style="background-color: #cccccc" data-operation="color" data-color="#cccccc">&nbsp;</a></li><li><a href="#" style="background-color: #205081" data-operation="color" data-color="#205081">&nbsp;</a></li><li><a href="#" style="background-color: #59afe1" data-operation="color" data-color="#59afe1">&nbsp;</a></li><li><a href="#" style="background-color: #14892c" data-operation="color" data-color="#14892c">&nbsp;</a></li><li><a href="#" style="background-color: #8eb021" data-operation="color" data-color="#8eb021">&nbsp;</a></li><li><a href="#" style="background-color: #d04437" data-operation="color" data-color="#d04437">&nbsp;</a></li><li><a href="#" style="background-color: #f79232" data-operation="color" data-color="#f79232">&nbsp;</a></li><li><a href="#" style="background-color: #f6c342" data-operation="color" data-color="#f6c342">&nbsp;</a></li><li><a href="#" style="background-color: #654982" data-operation="color" data-color="#654982">&nbsp;</a></li><li><a href="#" style="background-color: #f691b2" data-operation="color" data-color="#f691b2">&nbsp;</a></li></ul></div></div><div id="wiki-edit-dropdown2-icon-picker-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-picker wiki-edit-icon-picker" data-container="wiki-edit-icon-picker-buttons-wikiEdit0"><div class="aui-dropdown2-section"><ul><li><a original-title=":)" href="#" class="wiki-edit-operation" data-operation=":)"><img src="test_files/smile.gif" alt="smile"></a></li><li><a original-title=":(" href="#" class="wiki-edit-operation" data-operation=":("><img src="test_files/sad.gif" alt="sad"></a></li><li><a original-title=":P" href="#" class="wiki-edit-operation" data-operation=":P"><img src="test_files/tongue.gif" alt="tongue"></a></li><li><a original-title=":D" href="#" class="wiki-edit-operation" data-operation=":D"><img src="test_files/biggrin.gif" alt="biggrin"></a></li><li><a original-title=";)" href="#" class="wiki-edit-operation" data-operation=";)"><img src="test_files/wink.gif" alt="wink"></a></li><li><a original-title="(y)" href="#" class="wiki-edit-operation" data-operation="(y)"><img src="test_files/thumbs_up.gif" alt="thumbs up"></a></li><li><a original-title="(n)" href="#" class="wiki-edit-operation" data-operation="(n)"><img src="test_files/thumbs_down.gif" alt="thumbs down"></a></li><li><a original-title="(i)" href="#" class="wiki-edit-operation" data-operation="(i)"><img src="test_files/information.gif" alt="information"></a></li><li><a original-title="(/)" href="#" class="wiki-edit-operation" data-operation="(/)"><img src="test_files/check.gif" alt="check"></a></li><li><a original-title="(x)" href="#" class="wiki-edit-operation" data-operation="(x)"><img src="test_files/error.gif" alt="error"></a></li><li><a original-title="(!)" href="#" class="wiki-edit-operation" data-operation="(!)"><img src="test_files/warning.gif" alt="warning"></a></li><li><a original-title="(+)" href="#" class="wiki-edit-operation" data-operation="(+)"><img src="test_files/add.gif" alt="add"></a></li><li><a original-title="(-)" href="#" class="wiki-edit-operation" data-operation="(-)"><img src="test_files/forbidden.gif" alt="forbidden"></a></li><li><a original-title="(?)" href="#" class="wiki-edit-operation" data-operation="(?)"><img src="test_files/help_16.gif" alt="help"></a></li><li><a original-title="(on)" href="#" class="wiki-edit-operation" data-operation="(on)"><img src="test_files/lightbulb_on.gif" alt="lightbulb on"></a></li><li><a original-title="(off)" href="#" class="wiki-edit-operation" data-operation="(off)"><img src="test_files/lightbulb.gif" alt="lightbulb"></a></li><li><a original-title="(*)" href="#" class="wiki-edit-operation" data-operation="(*)"><img src="test_files/star_yellow.gif" alt="star yellow"></a></li><li><a original-title="(*r)" href="#" class="wiki-edit-operation" data-operation="(*r)"><img src="test_files/star_red.gif" alt="star red"></a></li><li><a original-title="(*g)" href="#" class="wiki-edit-operation" data-operation="(*g)"><img src="test_files/star_green.gif" alt="star green"></a></li><li><a original-title="(*b)" href="#" class="wiki-edit-operation" data-operation="(*b)"><img src="test_files/star_blue.gif" alt="star blue"></a></li><li><a original-title="(*y)" href="#" class="wiki-edit-operation" data-operation="(*y)"><img src="test_files/star_yellow.gif" alt="star yellow"></a></li></ul></div></div><div id="wiki-edit-dropdown2-other-wikiEdit0" class="aui-dropdown2 aui-style-default wiki-edit-dropdown"><div class="aui-dropdown2-section"><ul class="aui-list-truncate"><li><a href="#" class="wiki-edit-operation" data-operation="mention">User mention</a></li><li><a href="#" class="wiki-edit-operation" data-operation="table">Table</a></li><li><a href="#" class="wiki-edit-operation" data-operation="code">Code</a></li><li><a href="#" class="wiki-edit-operation" data-operation="noformat">Preformatted</a></li><li><a href="#" class="wiki-edit-operation" data-operation="panel">Panel</a></li><li><a href="#" class="wiki-edit-operation" data-operation="hr">Horizontal ruler</a></li></ul></div></div><div class="wiki-edit-toolbar" id="wiki-edit-wikiEdit0"><div class="aui-toolbar2"><div class="aui-toolbar2-inner"><div class="aui-toolbar2-primary"><div class="aui-buttons"><a original-title="" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-style-picker-trigger" aria-owns="wiki-edit-dropdown2-text-style-wikiEdit0" aria-haspopup="true" aria-controls="toolbardemo-dropdown2-more-wikiEdit0">Style</a></div><div class="aui-buttons wiki-edit-toolbar-section"><a original-title="Bold (Ctrl+B)" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation" data-operation="bold" data-shortcut="ctrl+b, command+b"><span class="aui-icon aui-icon-small aui-iconfont-editor-bold">Bold</span></a><a original-title="Italic (Ctrl+I)" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation" data-operation="italic" data-shortcut="ctrl+i, command+i"><span class="aui-icon aui-icon-small aui-iconfont-editor-italic">Italic</span></a><a original-title="Underline (Ctrl+U)" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation" data-operation="underline" data-shortcut="ctrl+u, command+u"><span class="aui-icon aui-icon-small aui-iconfont-editor-underline">Underline</span></a><a original-title="Text color" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation wiki-edit-operation-color" data-operation="color" data-color="red"><span class="aui-icon aui-icon-small aui-iconfont-editor-color">Text color</span><span style="background-color: red;" class="wiki-edit-color-indicator"></span></a><a original-title="More colors" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-color-picker-trigger" data-operation="color-parameter" aria-owns="wiki-edit-color-picker-wikiEdit0" aria-haspopup="true"><span>More colors</span></a><a original-title="More" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-more-picker-trigger" aria-owns="wiki-edit-dropdown2-more-wikiEdit0" aria-haspopup="true" aria-controls="toolbardemo-dropdown2-more-wikiEdit0"><span class="aui-icon aui-icon-small aui-iconfont-editor-styles">More</span></a></div><div class="aui-buttons"><a original-title="Link (Ctrl+K)" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-link-picker-trigger" aria-owns="wiki-edit-dropdown2-link-wikiEdit0" aria-haspopup="true" aria-controls="wiki-edit-dropdown2-link-wikiEdit0"><span class="aui-icon aui-icon-small aui-iconfont-link">Link</span></a><a original-title="Image" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-image-picker-trigger" aria-owns="wiki-edit-dropdown2-image-wikiEdit0" aria-haspopup="true" aria-controls="wiki-edit-dropdown2-image-wikiEdit0"><span class="aui-icon aui-icon-small aui-iconfont-image">Image</span></a></div><div class="aui-buttons wiki-edit-toolbar-section"><a original-title="Bullet list (Ctrl+Shift+B)" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation" data-operation="bullet-list" data-shortcut="ctrl+shift+b, command+shift+b"><span class="aui-icon aui-icon-small aui-iconfont-editor-list-bullet">Bullet list</span></a><a original-title="Numbered list (Ctrl+Shift+N)" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-operation" data-operation="numbered-list" data-shortcut="ctrl+shift+n, command+shift+n"><span class="aui-icon aui-icon-small aui-iconfont-editor-list-number">Numbered list</span></a></div><div class="aui-buttons"><a original-title="Icons" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-icon-picker-trigger wiki-edit-tooltip" aria-owns="wiki-edit-dropdown2-icon-picker-wikiEdit0" aria-haspopup="true" aria-controls="wiki-edit-dropdown2-icon-picker-wikiEdit0"><span class="aui-icon aui-icon-small aui-iconfont-editor-emoticon">Icons</span></a><a original-title="Other" href="#" tabindex="-1" class="aui-button aui-button-subtle aui-dropdown2-trigger wiki-edit-other-picker-trigger wiki-edit-tooltip" aria-owns="wiki-edit-dropdown2-other-wikiEdit0" aria-haspopup="true" aria-controls="wiki-edit-dropdown2-other-wikiEdit0"><span class="aui-icon aui-icon-small aui-iconfont-add">Other</span></a></div><div class="aui-buttons wiki-edit-toolbar-last"><a original-title="Toggle visibility" href="#" tabindex="-1" class="aui-button aui-button-subtle wiki-edit-visible-toggle wiki-edit-tooltip"><span class="aui-icon icon-toolbartoggle">Lock / Unlock</span></a></div></div></div><!-- .aui-toolbar-inner --></div></div><div id="comment-wiki-edit" class="wiki-edit-content">
-                                 <textarea class="textarea long-field wiki-textfield mentionable" cols="60" id="comment" name="comment" rows="10" data-projectkey="OR" data-issuekey="OR-2349" wrap="virtual"></textarea>
-                <div class="content-inner">            
-        </div>
-    </div>
-</div>
-<div class="field-tools">
-    
-    <button class="jira-icon-button fullscreen" id="comment-preview_link" type="button"><span class="aui-icon wiki-renderer-icon">Preview comment</span></button>
-    <a class="help-lnk" id="viewHelp" href="https://ci.open-paas.org/jira/secure/WikiRendererHelpAction.jspa?section=texteffects" title="Get local help about wiki markup help" data-helplink="local"><span class="aui-icon aui-icon-small aui-iconfont-help"></span></a>
-</div>
-
-                                                                                        <div class="security-level">
-        <fieldset class="hidden parameters">
-            <input title="securityLevelViewableByAll" value="Viewable by All Users" type="hidden">
-            <input title="securityLevelViewableRestrictedTo" value="Restricted to &lt;span class='redText'&gt;{0}&lt;/span&gt;" type="hidden">
-        </fieldset>
-        
-        <div class="select-menu" id="commentLevel-multi-select"><a class="drop" href="#">
-            <span class="security-level-drop-icon aui-icon aui-icon-small  aui-iconfont-unlocked">
-                This comment will be Viewable by All Users
-            </span>
-            <span class="icon drop-menu"></span>
-        </a><div class="aui-list aui-list-checked" id="commentLevel-suggestions" tabindex="-1"></div></div><div class="select-menu" id="commentLevel-multi-select"><div class="aui-list aui-list-checked" id="commentLevel-suggestions" tabindex="-1"></div></div><select multiple="multiple" style="display: none;" name="commentLevel" id="commentLevel">
-            <option selected="selected" value="">All Users</option>
-                            <optgroup label="Project Roles">
-                                            <option value="role:10002">Administrators</option>
-                                             <option value="role:10001">Developers</option>
-                                             <option value="role:10000">Users</option>
-                                     </optgroup>
-                                </select>
-        <span class="current-level">Viewable by All Users</span>
-    </div>
-                                    </div>
-    
-            </div>
-            <div class="buttons-container form-footer">
-                <div class="buttons">
-                    <input accesskey="s" class="aui-button" id="issue-comment-add-submit" name="Add" title="Press Alt+Shift+s to submit this form" value="Add" type="submit">
-                    <a accesskey="`" class="aui-button aui-button-link cancel" href="#" id="issue-comment-add-cancel" title="Press Alt+Shift+` to cancel">Cancel</a>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="mod-footer">
-        <ul class="ops">
-            <li>
-                <a href="https://ci.open-paas.org/jira/secure/AddComment%21default.jspa?id=16626" id="footer-comment-button" name="add-comment" class="aui-button">
-                    <span class="aui-icon aui-icon-small aui-iconfont-comment icon-comment"></span>
-                    <span>Comment</span>
-                </a>
-            </li>
-        </ul>
-    </div>
-</div>
-
-</div>
-</div><div id="viewissuesidebar" class="aui-item issue-side-column"><div id="peoplemodule" class="module toggle-wrap"><div id="peoplemodule_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">People</h2></div><div class="mod-content"><ul class="item-details" id="peopledetails">
-    <li class="people-details">
-                <dl>
-            <dt>Assignee:</dt>
-            <dd>
-                <span title="Click to edit" id="assignee-val" class="view-issue-field editable-field inactive">
-
-            <span class="user-hover" id="issue_summary_assignee_scolson" rel="scolson">
-            
-
-    <span class="aui-avatar aui-avatar-small"><span class="aui-avatar-inner"><img src="test_files/useravatar.png" alt="scolson"></span></span>
-            Stephane COLSON
-        </span>
-    <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-                            </dd>
-        </dl>
-                        <dl>
-            <dt>Reporter:</dt>
-            <dd>
-                <span title="Click to edit" id="reporter-val" class="view-issue-field editable-field inactive">
-
-            <span class="user-hover" id="issue_summary_reporter_scolson" rel="scolson">
-            
-
-    <span class="aui-avatar aui-avatar-small"><span class="aui-avatar-inner"><img src="test_files/useravatar.png" alt="scolson"></span></span>
-            Stephane COLSON
-        </span>
-    <span class="overlay-icon aui-icon aui-icon-small aui-iconfont-edit"></span></span>
-            </dd>
-        </dl>
-                    </li>
-</ul>
-    <ul class="item-details">
-        <li>
-                            <dl>
-                    <dt>Votes:</dt>
-                    <dd>
-                                                                            <a id="view-voter-list" href="https://ci.open-paas.org/jira/secure/ViewVoters%21default.jspa?id=16626" title="View Voters">
-                                                    <span id="vote-data" class="aui-badge vote-state-off">0</span>
-                                                    </a>
-                        
-                                                                    </dd>
-                </dl>
-                                        <dl>
-                    <dt>Watchers:</dt>
-                    <dd>
-                                                                        
-                                                                            <a aria-haspopup="true" aria-expanded="false" class="__skate" id="view-watcher-list" href="https://ci.open-paas.org/jira/secure/ManageWatchers%21default.jspa?id=16626" title="View Watchers" aria-controls="inline-dialog-watchers" data-aui-trigger="">
-                                                    <span id="watcher-data" class="aui-badge watch-state-on">1</span>
-                                                    </a>
-                            <aui-inline-dialog2 data-aui-persistent="true" id="inline-dialog-watchers" class="aui-layer aui-inline-dialog __skate" data-aui-alignment="bottom left" data-aui-responds-to="none" aria-hidden="true">
-                                <div class="aui-inline-dialog-contents"></div>
-                            </aui-inline-dialog2>
-                        
-                                                                                    <a id="watching-toggle" class="watch-state-on" href="https://ci.open-paas.org/jira/secure/VoteOrWatchIssue.jspa?atl_token=BE2F-79PL-H8QS-2STB%7C99bf85b35fda4cb18ee69314eef5a1392be0a3d3%7Clin&amp;id=16626&amp;watch=unwatch" rel="16626">Stop watching this issue</a> <span class="icon"></span>
-                                                                        </dd>
-                </dl>
-                    </li>
-    </ul>
-</div></div><div id="datesmodule" class="module toggle-wrap"><div id="datesmodule_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Dates</h2></div><div class="mod-content"><ul class="item-details">
-    <li>
-            <dl class="dates">
-            <dt>Created:</dt>
-            <dd class="date user-tz" title="13/Jul/16 10:32 AM">
-
-                <span data-name="Created" id="create-date" data-fieldtype="datetime">
-                                                                        <time class="livestamp" datetime="2016-07-13T10:32:00+0200">4 hours ago</time>                                                             </span>
-            </dd>
-        </dl>
-            <dl class="dates">
-            <dt>Updated:</dt>
-            <dd class="date user-tz" title="13/Jul/16 10:59 AM">
-
-                <span data-name="Updated" id="updated-date" data-fieldtype="datetime">
-                                                                        <time class="livestamp" datetime="2016-07-13T10:59:46+0200">4 hours ago</time>                                                             </span>
-            </dd>
-        </dl>
-        </li>
-</ul>
-</div></div><div style="display: block;" id="viewissue-devstatus-panel" class="module toggle-wrap js-animation-completed"><div id="viewissue-devstatus-panel_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Development</h2><div class="try-labs-container"></div></div><div class="mod-content"><ul id="devstatus-container" class="item-details dev-status-container" data-labs-json="{&quot;allowed&quot;:false,&quot;optedIn&quot;:true,&quot;optedInByAdmin&quot;:true,&quot;dismissed&quot;:false,&quot;id&quot;:1}" data-show-contact-admin-form="false" data-issue-type="Bug" data-issue-status="Progressing" data-is-assignable="true" data-is-assignee="true" data-ait-help-url-json="{&quot;url&quot;:&quot;https://docs.atlassian.com/jira/docs-064/Advanced+workflow+configuration&quot;,&quot;alt&quot;:&quot;Get help!&quot;,&quot;key&quot;:&quot;workflow.auto.triggers&quot;,&quot;local&quot;:false,&quot;title&quot;:&quot;Advanced workflow configuration&quot;}" data-issue-id="16626" data-issue-key="OR-2349"><div class="hidden dev-summary json-blob" data-json="{&quot;cachedValue&quot;:{&quot;errors&quot;:[],&quot;configErrors&quot;:[],&quot;summary&quot;:{&quot;pullrequest&quot;:{&quot;overall&quot;:{&quot;count&quot;:1,&quot;lastUpdated&quot;:&quot;2016-07-13T12:43:39.542+0200&quot;,&quot;stateCount&quot;:1,&quot;state&quot;:&quot;OPEN&quot;,&quot;open&quot;:true},&quot;byInstanceType&quot;:{&quot;stash&quot;:{&quot;count&quot;:1,&quot;name&quot;:&quot;Stash&quot;}}},&quot;build&quot;:{&quot;overall&quot;:{&quot;count&quot;:0,&quot;lastUpdated&quot;:null,&quot;failedBuildCount&quot;:0,&quot;successfulBuildCount&quot;:0,&quot;unknownBuildCount&quot;:0},&quot;byInstanceType&quot;:{}},&quot;review&quot;:{&quot;overall&quot;:{&quot;count&quot;:0,&quot;lastUpdated&quot;:null,&quot;stateCount&quot;:0,&quot;state&quot;:null,&quot;dueDate&quot;:null,&quot;overDue&quot;:false,&quot;completed&quot;:false},&quot;byInstanceType&quot;:{}},&quot;deployment-environment&quot;:{&quot;overall&quot;:{&quot;count&quot;:0,&quot;lastUpdated&quot;:null,&quot;topEnvironments&quot;:[],&quot;showProjects&quot;:false,&quot;successfulCount&quot;:0},&quot;byInstanceType&quot;:{}},&quot;repository&quot;:{&quot;overall&quot;:{&quot;count&quot;:0,&quot;lastUpdated&quot;:null},&quot;byInstanceType&quot;:{}},&quot;branch&quot;:{&quot;overall&quot;:{&quot;count&quot;:1,&quot;lastUpdated&quot;:&quot;2016-07-13T12:43:39.542+0200&quot;},&quot;byInstanceType&quot;:{&quot;stash&quot;:{&quot;count&quot;:1,&quot;name&quot;:&quot;Stash&quot;}}}}},&quot;isStale&quot;:false}"></div><ul class="item-details status-panels devstatus-entry"><li class="status-panel js-has-data" id="branch-status-panel" data-module="BranchModule"><dl><dt><div style="height: auto;" class="rolling-container sliding-container"><div class="rolling-content"><div class="summary-content"><a class="summary" href="https://ci.open-paas.org/jira/browse/OR-2349?devStatusDetailDialog=branch" title="Branches related to OR-2349"><span class="count">1</span> branch</a></div></div></div></dt><dd class="sub-text"><div style="height: auto;" class="rolling-container sliding-container"><div class="rolling-content"><div>Updated <time title="13/Jul/16 2:09 PM" class="livestamp date user-tz allow-future" data-datetime-format="fullAge" datetime="2016-07-13T14:09:29.039+0200">33 minutes ago</time></div></div></div></dd></dl></li><li class="status-panel hidden js-has-data" id="commit-status-panel" data-module="CommitModule"></li><li class="status-panel js-has-data" id="pullrequest-status-panel" data-module="PullRequestModule"><dl><dt><div style="height: auto;" class="rolling-container sliding-container"><div class="rolling-content"><div class="summary-content"><a class="summary" href="https://ci.open-paas.org/jira/browse/OR-2349?devStatusDetailDialog=pullrequest" title="Pull requests related to OR-2349"><span class="count">1</span> pull request</a> <span class="aui-lozenge aui-lozenge-overflow aui-lozenge-subtle aui-lozenge-complete  pullrequest-state">OPEN</span></div></div></div></dt><dd class="sub-text"><div style="height: auto;" class="rolling-container sliding-container"><div class="rolling-content"><div>Updated <time title="13/Jul/16 2:09 PM" class="livestamp date user-tz allow-future" data-datetime-format="fullAge" datetime="2016-07-13T14:09:29.039+0200">33 minutes ago</time></div></div></div></dd></dl></li><li class="status-panel hidden js-has-data" id="review-status-panel" data-module="ReviewModule"></li><li class="status-panel hidden js-has-data" id="build-status-panel" data-module="BuildModule" data-issue-type="Bug" data-issue-status="Progressing" data-is-assignee="true"></li><li class="status-panel deployment-summary hidden js-has-data" id="deployment-status-panel" data-module="DeploymentModule" data-issue-type="Bug" data-issue-status="Progressing" data-is-assignee="true"></li></ul><li class="call-to-actions devstatus-entry"><a href="https://ci.open-paas.org/jira/browse/OR-2349?devStatusDetailDialog=create-branch" class="devstatus-cta-link" data-issueid="16626" data-issue-type="Bug" data-issue-status="Progressing" data-is-assignee="true"><span class="devstatus-cta-link-text">Create branch</span></a></li><li class="message-panel hidden"></li><li class="labs-on-off-container hidden"></li></ul></div></div><div id="greenhopper-agile-issue-web-panel" class="module toggle-wrap"><div id="greenhopper-agile-issue-web-panel_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Agile</h2></div><div class="mod-content">
-
-<ul class="item-details ghx-separated">
-    <li>
-        <a class="issueaction-greenhopper-rapidboard-operation js-rapidboard-operation-issue" href="https://ci.open-paas.org/jira/secure/GHGoToBoard.jspa?issueId=16626" title="View this issue on an Agile board">
-            View on Board
-        </a>
-    </li>
-</ul>
-</div></div><div style="display: none;" id="bamboo-deployment-projects-right" class="module toggle-wrap"><div id="bamboo-deployment-projects-right_heading" class="mod-header"><ul class="ops"></ul><h2 class="toggle-title">Issue deployment</h2></div><div class="mod-content"><div id="issue-deployments-panel-content"></div>
-<script>
-    (function ($, JBAM_DEPLOYMENT){
-        if (!JBAM_DEPLOYMENT) {
-            return; // Don't bother rendering, since the resources aren't loaded (yet?).
-        }
-        if (JBAM_DEPLOYMENT.panel) {
-            JBAM_DEPLOYMENT.panel.remove();
-        }
-        JBAM_DEPLOYMENT.panel =  new JBAM_DEPLOYMENT.RelatedDeploymentProjects.View({
-                                                                                    el: '#issue-deployments-panel-content',
-                                                                                    fetchUrl: '/jira/rest/bamboo/latest/deploy/OR/OR-2349',
-                                                                                    oAuthDanceReturnUrl: '/jira/browse/OR-2349',
-                                                                                    issueId: '16626'
-                                                                                });
-    }(AJS.$, window.JBAM_DEPLOYMENT));
-</script>
-</div></div></div></div>
-                    </div>
-                </div>
-                        </div>
-
-    
-    </section>
-    <footer id="footer" role="contentinfo">
-        
-
-<section class="footer-body">
-
-
-
-<ul class="atlassian-footer">
-    <li>
-        Atlassian JIRA <a class="seo-link" href="https://www.atlassian.com/software/jira">Project Management Software</a>
-
-                                    
-                        
-        <span id="footer-build-information">(v6.4.5#64020-<span title="78acd6c502bd8e526a3f0032b770e55d6f3a3b0f" data-commit-id="78acd6c502bd8e526a3f0032b770e55d6f3a3b0f}">sha1:78acd6c</span>)</span>
-    </li>
-    <li>
-        <a id="about-link" href="https://ci.open-paas.org/jira/secure/AboutPage.jspa">About JIRA</a>
-    </li>
-    <li>
-                        <a id="footer-report-problem-link" href="https://ci.open-paas.org/jira/plugins/servlet/stp/view/">Report a problem</a>
-    </li>
-</ul>
-    <ul class="atlassian-footer">
-        <li class="licensemessage">
-                            Powered by a free Atlassian <a href="http://www.atlassian.com/software/jira">JIRA</a> open source license for OpenPaas. Try JIRA - <a href="http://www.atlassian.com/software/jira">bug tracking software</a> for <i>your</i> team.
-
-                    </li>
-    </ul>
-
-<form id="jira_request_timing_info" class="dont-default-focus">
-	<fieldset class="parameters hidden">
-		<input title="jira.request.start.millis" value="1468406810817" type="hidden">
-		<input title="jira.request.server.time" value="299" type="hidden">
-		<input title="jira.request.id" value="766x3439770x1" type="hidden">
-		<input title="jira.session.expiry.time" value="1468424805974" type="hidden">
-		<input title="jira.session.expiry.in.mins" value="299" type="hidden">
-		<input id="jiraConcurrentRequests" name="jira.request.concurrent.requests" value="1" type="hidden">
-	</fieldset>
-</form>
-<!--
-	                 REQUEST ID : 766x3439770x1
-	          REQUEST TIMESTAMP : [13/Jul/2016:12:46:50 +0200]
-	               REQUEST TIME : 0.2990
-	                 ASESSIONID : 47ya8y
-	        CONCURRENT REQUESTS : 1
-
-	                      db.reads : name=db.reads; inv=24; ms=19; cpu=0; rss=0;
-	                     db.writes : name=db.writes; inv=2; ms=4; cpu=0; rss=0;
-	                      db.conns : name=db.conns; inv=35; ms=33; cpu=0; rss=0;
--->
-    <div id="footer-logo"><a href="http://www.atlassian.com/">Atlassian</a></div>
-</section>
-
-
-
-
-
-
-
-
-
-<fieldset class="hidden parameters">
-    <input title="loggedInUser" value="scolson" type="hidden">
-    <input title="ajaxTimeout" value="The call to the JIRA server did not complete within the timeout period.  We are unsure of the result of this operation." type="hidden">
-    <input title="JiraVersion" value="6.4.5" type="hidden">
-    <input title="ajaxUnauthorised" value="You are not authorized to perform this operation.  Please log in." type="hidden">
-    <input title="baseURL" value="https://ci.open-paas.org:443/jira" type="hidden">
-    <input title="ajaxCommsError" value="The JIRA server could not be contacted. This may be a temporary glitch or the server may be down." type="hidden">
-    <input title="ajaxServerError" value="The JIRA server was contacted but has returned an error response. We are unsure of the result of this operation." type="hidden">
-    <input title="ajaxErrorCloseDialog" value="Close this dialog and press refresh in your browser" type="hidden">
-    <input title="ajaxErrorDialogHeading" value="Communications Breakdown" type="hidden">
-
-    <input title="dirtyMessage" value="You have entered new data on this page. If you navigate away from this page without first saving your data, the changes will be lost." type="hidden">
-    <input title="dirtyDialogMessage" value="You have entered new data in this dialog. If you navigate away from this dialog without first saving your data, the changes will be lost. Click cancel to return to the dialog." type="hidden">
-    <input title="keyType" value="Type" type="hidden">
-    <input title="keyThen" value="then" type="hidden">
-    <input title="dblClickToExpand" value="Double click to expand" type="hidden">
-    <input title="actions" value="Actions" type="hidden">
-    <input title="removeItem" value="Remove" type="hidden">
-    <input title="workflow" value="Workflow" type="hidden">
-    <input title="labelNew" value="New Label" type="hidden">
-    <input title="issueActionsHint" value="Begin typing for available operations or press down to see all" type="hidden">
-    <input title="closelink" value="Close" type="hidden">
-    <input title="dotOperations" value="Operations" type="hidden">
-    <input title="dotLoading" value="Loading..." type="hidden">
-    <input title="frotherSuggestions" value="Suggestions" type="hidden">
-    <input title="frotherNomatches" value="No Matches" type="hidden">
-    <input title="multiselectVersionsError" value="{0} is not a valid version." type="hidden">
-    <input title="multiselectComponentsError" value="{0} is not a valid component." type="hidden">
-    <input title="multiselectGenericError" value="The value {0} is invalid." type="hidden">
-</fieldset>
-
-    </footer>
-</div>
-
-
-<div id="fancybox-tmp"></div><div id="fancybox-loading"><div></div></div><div id="fancybox-overlay"></div><div id="fancybox-wrap"><div id="fancybox-outer"><div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div><div id="fancybox-content"></div><a id="fancybox-close"></a><div id="fancybox-title"></div><a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a><a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a></div></div><span style="display: none;position: absolute;z-index: 8675309;width: 100px;height: 25px;background-image: url(https://d389zggrogs7qo.cloudfront.net/images/extensions/img/buffer-hover-icon@2x.png);background-size: 100px 25px;opacity: 0.9;cursor: pointer;" id="buffer-extension-hover-button"></span><div style="display: none;" class="jira-dialog box-shadow" id="edit-issue-dialog"><div class="jira-dialog-content"></div></div></body></html>
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadEndpoint.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadEndpoint.feature
deleted file mode 100644
index e676798e2f3..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadEndpoint.feature
+++ /dev/null
@@ -1,100 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-
-Feature: Download endpoint
-  As a James user
-  I want to access to the download endpoint
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "usera@domain.tld, userb@domain.tld"
-    And "usera@domain.tld" has a mailbox "INBOX"
-    And "usera@domain.tld" mailbox "INBOX" contains a message "m1" with an attachment "a1"
-
-  Scenario: An unauthenticated user should not have access to the download endpoint
-    When un-authenticated user downloads "a1"
-    Then the user should not be authorized
-
-  Scenario: An authenticated user should initiate the access to the download endpoint
-    Given "usera@domain.tld" is connected
-    When "usera@domain.tld" checks for the availability of the attachment endpoint
-    Then the user should be authorized
-
-  Scenario: An unauthenticated user should initiate the access to the download endpoint
-    When "usera@domain.tld" checks for the availability of the attachment endpoint
-    Then the user should be authorized
-
-  Scenario: A user should not have access to the download endpoint without the authentication token
-    When "usera@domain.tld" downloads "a1" without any authentication token
-    Then the user should not be authorized
-
-  Scenario: A user should not have access to the download endpoint with an empty authentication token
-    When "usera@domain.tld" downloads "a1" with an empty authentication token
-    Then the user should not be authorized
-
-  Scenario: A user should not have access to the download endpoint with a bad authentication token
-    When "usera@domain.tld" downloads "a1" with a bad authentication token
-    Then the user should not be authorized
-
-  Scenario: A user should not have access to the download endpoint with an unknown authentication token
-    When "usera@domain.tld" downloads "a1" with an invalid authentication token
-    Then the user should not be authorized
-
-  Scenario: A user should not have access to the download endpoint when an authentication token has expired
-    When "usera@domain.tld" downloads "a1" with an expired token
-    Then the user should not be authorized
-
-  Scenario: A user should not have access to the download endpoint without a blobId
-    Given "usera@domain.tld" is trusted for attachment "a1"
-    When "usera@domain.tld" downloads "a1" without blobId parameter
-    Then the user should not be authorized
-
-  Scenario: A user should not retrieve anything when using wrong blobId
-    Given "usera@domain.tld" is trusted for attachment "a1"
-    When "usera@domain.tld" downloads "a1" with wrong blobId
-    Then the user should not be authorized
-
-  @BasicFeature
-  Scenario: A user should have access to the download endpoint when an authentication token is valid
-    Given "usera@domain.tld" is trusted for attachment "a1"
-    When "usera@domain.tld" downloads "a1" using query parameter strategy
-    Then the user should be authorized
-
-  Scenario: An authenticated user should have access to the download endpoint
-    Given "usera@domain.tld" is connected
-    When "usera@domain.tld" downloads "a1"
-    Then the user should be authorized
-
-  Scenario: An authenticated user should not have access to someone else attachment
-    Given "userb@domain.tld" is connected
-    When "userb@domain.tld" downloads "a1"
-    Then the user should receive a not found response
-
-  Scenario: A user should have access to an inlined attachment
-    Given "usera@domain.tld" is connected
-    And "usera@domain.tld" mailbox "INBOX" contains a message "m2" with an inlined attachment "ia1"
-    When "usera@domain.tld" downloads "ia1"
-    Then the user should be authorized
-
-  Scenario: A user should have access to multiple same inlined attachments
-    Given "usera@domain.tld" is connected
-    And "usera@domain.tld" mailbox "INBOX" contains a message "m2" with multiple same inlined attachments "ia1"
-    When "usera@domain.tld" downloads "ia1"
-    And "usera@domain.tld" downloads "ia1"
-    Then the user should be authorized
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadGet.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadGet.feature
deleted file mode 100644
index 0e4107f073d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadGet.feature
+++ /dev/null
@@ -1,99 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Download GET
-  As a James user
-  I want to retrieve my blobs (attachments and messages)
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And a user "bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "INBOX"
-
-  @BasicFeature
-  Scenario: Getting an attachment previously stored
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "alice@domain.tld" downloads "2"
-    Then she can read that blob
-    And the blob size is 3071
-
-  Scenario: Getting an attachment with an unknown blobId
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "alice@domain.tld" downloads "2" with a valid authentication token but a bad blobId
-    Then "alice@domain.tld" should receive a not found response
-
-  Scenario: Getting an attachment previously stored with a desired name
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "alice@domain.tld" downloads "2" with "myFileName.txt" name
-    Then she can read that blob
-    And the attachment is named "myFileName.txt"
-
-  Scenario: Getting an attachment previously stored with a non ASCII name
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "alice@domain.tld" downloads "2" with "ديناصور.odt" name
-    Then she can read that blob
-    And the attachment is named "ديناصور.odt"
-
-  Scenario: Getting an attachment with a specified Content-Type
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2" having "application/pdf" contentType
-    When "alice@domain.tld" downloads "2" with "myFileName.txt" name
-    Then she can read that blob
-    And the Content-Type is "application/pdf"
-
-  @BasicFeature
-  Scenario: Getting a message blob previously stored
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1"
-    When "alice@domain.tld" downloads "1"
-    Then she can read that blob
-    And the blob size is 4963
-
-  Scenario: Content-Length header should be positioned before transfers starts
-    Given "alice@domain.tld" mailbox "INBOX" contains a big message "1"
-    When "alice@domain.tld" downloads "1"
-    Then the blob size is 2621440
-
-  Scenario: Getting a message then getting its blob
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail"
-    And "alice@domain.tld" ask for message "m1"
-    When "alice@domain.tld" downloads the message by its blobId
-    Then she can read that blob
-    And the blob size is 36
-
-  Scenario: Position CORS headers
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1"
-    When "alice@domain.tld" downloads "1"
-    Then she can read that blob
-    And CORS headers are positioned
-
-  Scenario: Deleted message should revoke attachment blob download rights
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    And "alice@domain.tld" delete mailbox "INBOX"
-    When "alice@domain.tld" downloads "2"
-    Then "alice@domain.tld" should receive a not found response
-
-  Scenario: User cannot download attachment of another user
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "bob@domain.tld" downloads "2"
-    Then "alice@domain.tld" should receive a not found response
-
-  Scenario: User cannot download message blob of another user
-    Given "alice@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "bob@domain.tld" downloads "1"
-    Then "bob@domain.tld" should receive a not found response
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadPost.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadPost.feature
deleted file mode 100644
index 13270a14f02..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/DownloadPost.feature
+++ /dev/null
@@ -1,43 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-
-Feature: Alternative authentication mechanism for getting attachment via a POST request returning a specific authentication token
-  As a James user
-  I want to retrieve my attachments without an alternative authentication mechanism
-
-  Background:
-    Given a domain named "domain.tld"
-    And a connected user "username@domain.tld"
-    And "username@domain.tld" has a mailbox "INBOX"
-
-  Scenario: Asking for an attachment access token with an unknown blobId
-    When "username@domain.tld" asks for a token for attachment "123"
-    Then the user should receive a not found response
-
-  @BasicFeature
-  Scenario: Asking for an attachment access token with a previously stored blobId
-    Given "username@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "username@domain.tld" asks for a token for attachment "2"
-    Then the user should receive an attachment access token
-
-  Scenario: Position CORS headers
-    Given "username@domain.tld" mailbox "INBOX" contains a message "1" with an attachment "2"
-    When "username@domain.tld" asks for a token for attachment "2"
-    Then the user should receive an attachment access token
-    And CORS headers are positioned
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/GetMessages.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
deleted file mode 100644
index 4442c04d5c1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
+++ /dev/null
@@ -1,444 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: GetMessages method
-  As a James user
-  I want to be able to retrieve my messages
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And "alice@domain.tld" has a mailbox "INBOX"
-
-  Scenario: Retrieving a message in several mailboxes should return a single message in these mailboxes
-    Given "alice@domain.tld" has a mailbox "custom"
-    And "alice@domain.tld" has a message "m1" in "INBOX" and "custom" mailboxes with subject "my test subject", content "testmail"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the message is in "custom,INBOX" mailboxes
-
-  Scenario: Retrieving messages with a non null accountId should return a NotSupported error
-    When "alice@domain.tld" ask for messages using its accountId
-    Then an error "The field 'accountId' of 'GetMessagesMethod' is not supported" with type "invalidArguments" is returned
-
-  Scenario: Unknown arguments should be ignored when retrieving messages
-    When "alice@domain.tld" ask for messages using unknown arguments
-    Then no error is returned
-    And the list of unknown messages is empty
-    And the list of messages is empty
-
-  Scenario: Retrieving messages with invalid argument should return an InvalidArguments error
-    When "alice@domain.tld" ask for messages using invalid argument
-    Then an error of type "invalidArguments" is returned
-
-  Scenario: Retrieving messages should return empty list when no message
-    When "alice@domain.tld" ask for messages
-    Then no error is returned
-    And the list of messages is empty
-
-  Scenario: Retrieving message should return not found when message doesn't exist
-    When "alice@domain.tld" ask for an unknown message
-    Then no error is returned
-    And the notFound list should contain the requested message id
-
-  @BasicFeature
-  Scenario: Retrieving message should return messages when exists
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the threadId of the message is "m1"
-    And the subject of the message is "my test subject"
-    And the textBody of the message is "testmail"
-    And the isUnread of the message is "true"
-    And the preview of the message is "testmail"
-    And the headers of the message contains:
-      |Subject |my test subject |
-    And the date of the message is "2014-10-30T14:12:00Z"
-    And the hasAttachment of the message is "false"
-    And the list of attachments of the message is empty
-
-  Scenario Outline: Retrieving message should return messages when exists and is a html message
-    Given "alice@domain.tld" has a message "m1" in <mailbox> mailbox with content-type <content-type> subject <subject>, content <content>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the threadId of the message is "m1"
-    And the subject of the message is <subject>
-    And the htmlBody of the message is <content>
-    And the isUnread of the message is "true"
-    And the preview of the message is <preview>
-    And the headers of the message contains:
-      |Content-Type |text/html        |
-      |Subject      |<subject-header> |
-    And the date of the message is "2014-10-30T14:12:00Z"
-
-    Examples:
-      |mailbox |content-type |subject           |subject-header  |content                                                                                                                         |preview                                                                                      |
-      |"INBOX" |"text/html"  |"my test subject" |my test subject |"This is a <b>HTML</b> mail"                                                                                                    |"This is a HTML mail"                                                                        |
-      |"INBOX" |"text/html"  |"my test subject" |my test subject |"This is a <b>HTML</b> mail containing <u>underlined part</u>, <i>italic part</i> and <u><i>underlined AND italic part</i></u>" |"This is a HTML mail containing underlined part, italic part and underlined AND italic part" |
-      |"INBOX" |"text/html"  |"my test subject" |my test subject |"This is a <ganan>HTML</b> mail"                                                                                                |"This is a HTML mail"                                                                        |
-
-  Scenario Outline: Retrieving message should return preview with tags when text message
-    Given "alice@domain.tld" has a message "m1" in <mailbox> mailbox with content-type <content-type> subject <subject>, content <content>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the preview of the message is <preview>
-
-    Examples:
-      |mailbox |content-type |subject           |content                                                                               |preview                                                                               |
-      |"INBOX" |"text/plain" |"my test subject" |"Here is a listing of HTML tags : <b>jfjfjfj</b>, <i>jfhdgdgdfj</i>, <u>jfjaaafj</u>" |"Here is a listing of HTML tags : <b>jfjfjfj</b>, <i>jfhdgdgdfj</i>, <u>jfjaaafj</u>" |
-
-  Scenario: Retrieving message should filter properties
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail"
-    When "alice@domain.tld" is getting message "m1" with properties "id, subject"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the subject of the message is "my test subject"
-    And the property "textBody" of the message is null
-    And the property "isUnread" of the message is null
-    And the property "preview" of the message is null
-    And the property "headers" of the message is null
-    And the property "date" of the message is null
-
-  Scenario: Retrieving message should filter header properties
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail", headers
-      |From    |user@domain.tld |
-      |header1 |Header1Content  |
-      |HEADer2 |Header2Content  |
-    When "alice@domain.tld" is getting message "m1" with properties "headers.from, headers.heADER2"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the property "subject" of the message is null
-    And the property "textBody" of the message is null
-    And the property "isUnread" of the message is null
-    And the property "preview" of the message is null
-    And the headers of the message contains:
-      |From    |user@domain.tld |
-      |HEADer2 |Header2Content  |
-    And the property "date" of the message is null
-
-  Scenario: Retrieving message should return not found when id does not match
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail"
-    When "alice@domain.tld" ask for an unknown message
-    Then no error is returned
-    And the list of messages is empty
-    And the notFound list should contain the requested message id
-
-  Scenario: Retrieving message should return mandatory properties when not asked
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with subject "my test subject", content "testmail"
-    When "alice@domain.tld" is getting message "m1" with properties "subject"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the subject of the message is "my test subject"
-
-  @BasicFeature
-  Scenario: Retrieving message should return attachments when some
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with two attachments
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 2 attachments
-    And the first attachment is:
-      |type     |image/jpeg; name="4037_014.jpg"                                    |
-      |size     |846                                                                |
-      |cid      |null                                                               |
-      |isInline |false                                                              |
-    And the second attachment is:
-      |type     |image/jpeg; name="4037_015.jpg"                                    |
-      |size     |597                                                                |
-      |cid      |part1.37A15C92.A7C3488D@linagora.com                               |
-      |isInline |true                                                               |
-
-  Scenario: Retrieving message should return attachments and html body when some attachments and html message
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with two attachments
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 2 attachments
-    And the preview of the message is "html  tiramisu"
-    And the property "textBody" of the message is null
-    And the htmlBody of the message is "<b>html tiramisu</b>\n"
-
-  Scenario: Retrieving message should return attachments and text body when some attachments and text message
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with two attachments in text
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 2 attachments
-    And the preview of the message is "html\n"
-    And the textBody of the message is "html\n"
-    And the property "htmlBody" of the message is null
-
-  Scenario: Retrieving message should return attachments and both html/text body when some attachments and both html/text message
-    Given "alice@domain.tld" has a multipart message "m1" in "INBOX" mailbox
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachment
-    And the preview of the message is "blabla\nbloblo\n"
-    And the textBody of the message is "/blabla/\n*bloblo*\n"
-    And the htmlBody of the message is "<i>blabla</i>\n<b>bloblo</b>\n"
-
-  Scenario: Retrieving message should return image and html body when multipart/alternative where first part is multipart/related with html and image
-    Given "alice@domain.tld" has a multipart/related message "m1" in "INBOX" mailbox
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachment
-    And the preview of the message is "multipart/related content"
-    And the property "textBody" of the message is null
-    And the htmlBody of the message is "<html>multipart/related content</html>\n"
-
-  Scenario: Retrieving message should return textBody and htmlBody when incoming mail have an inlined HTML and text body without Content-ID
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox, composed of a multipart with inlined text part and inlined html part
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the textBody of the message is "Hello text body\n"
-    And the htmlBody of the message is "<html>Hello html body</html>\n"
-
-  Scenario: Retrieving message with more than 1000 char by line should return message when exists
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox beginning by a long line
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-
-  Scenario:
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with two same attachments in text
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list of attachments of the message contains 2 attachments
-
-  Scenario: Retrieving message should read content from multipart when some inline attachment and both html/text multipart
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with plain/text inline attachment
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "false"
-    And the textBody of the message is "/blabla/\n*bloblo*\n"
-    And the htmlBody of the message is "<i>blabla</i>\n<b>bloblo</b>\n"
-
-  Scenario: Retrieving message should find html body when text in main multipart and html in inner multipart
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with text in main multipart and html in inner multipart
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the textBody of the message is "/blabla/\r\n*bloblo*\r\n"
-    And the htmlBody of the message is "<i>blabla</i>\r\n<b>bloblo</b>\r\n"
-
-  Scenario: Retrieving message should compute text body from html body
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with html body and no text body
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the textBody of the message is "The Test User created an issue"
-    And the htmlBody of the message is "<a>The Test User</a> <strong>created</strong> an issue"
-
-  Scenario: Retrieving message with inline attachment but no CID should convert that inlined attachment to normal attachment
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with inline attachment but no CID
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-      |type     |application/pdf;	x-unix-mode=0644;	name="deromaCollection-628.pdf"  |
-      |cid      |null                                                                    |
-      |isInline |false                                                                   |
-
-  Scenario: Retrieving message with inline attachment and blank CID should convert that inlined attachment to normal attachment
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with inline attachment and blank CID
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-        |type     |application/pdf;	x-unix-mode=0644;	name="deromaCollection-628.pdf"      |
-        |cid      |null                                                                      |
-        |isInline |false                                                                     |
-
-  Scenario: Preview should be computed even when HTML body contains many tags without content
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with HTML body with many empty tags
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the preview of the message is not empty
-
-  Scenario: Retrieving message which contains multiple same inlined attachments
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with multiple same inlined attachments "ia1"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "false"
-    And the list of attachments of the message contains only one attachment with cid "1482981567586480bfca67b793175279@linagora.com"
-
-  Scenario: Preview and bodies should respect given charset
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with specific charset
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the preview of the message is "àààà éééé èèèè"
-    And the textBody of the message is "àààà\r\n\r\néééé\r\n\r\nèèèè\r\n"
-    And the htmlBody of the message is "<html>\r\n  <p>àààà</p>\r\n  <p>éééé</p>\r\n  <p>èèèè</p>\r\n</html>\r\n"
-
-  Scenario: Preview should be normalized in case of long and complicated HTML content
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with long and complicated HTML content
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the preview of the message is not empty
-    And the preview should not contain consecutive spaces or blank characters
-
-  Scenario Outline: Preview should display printable characters with charset
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox with content-type <content-type> subject "Subject", content <content>, headers
-        |Content-Transfer-Encoding    |<tranfer-encoding> |
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the preview of the message contains: "<preview>"
-
-    Examples:
-            |content-type                                       |tranfer-encoding   |content                                                                                                     |preview                                                                                      |
-            |"text/html; charset=iso-8859-1"                    |quoted-printable   |"Dans le cadre du stage effectu=E9 Mlle 2017, =E0 sign=E9e d=E8s que possible, =E0, tr=E8s, journ=E9e.."    |effectué Mlle 2017, à signée dès que possible, à, très, journée                                                                        |
-
-  @BasicFeature
-  Scenario Outline: Retrieving message should display keywords as jmap flag
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags <flags>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the keywords of the message is <keyword>
-
-    Examples:
-            |flags                          |keyword                        |
-            |"$Flagged,$Answered,$Draft"    |$Flagged,$Answered,$Draft      |
-
-  Scenario Outline: GetMessages should filter invalid keywords
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags <flags>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the keywords of the message is <keyword>
-
-    Examples:
-      |flags                               |keyword                |
-      |"$Draft,@ert,t^a,op§,$user_flag"    |$Draft,$user_flag      |
-
-  Scenario Outline: Retrieving message should display keywords without unsupported jmap flag
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags <flags>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the keywords of the message is <keyword>
-
-    Examples:
-            |flags                                  |keyword                 |
-            |"$Flagged,$Answered,$Deleted,$Recent"  |$Flagged,$Answered      |
-
-  Scenario Outline: Retrieving message should display keywords with custom user jmap flag
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags <flags>
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the keywords of the message is <keyword>
-
-    Examples:
-            |flags                    |keyword                 |
-            |"$Flagged,$Forwarded"    |$Forwarded,$Flagged     |
-
-  Scenario: Retrieving message should include true isForwarded property when set
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags "$Forwarded"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the isForwarded property of the message is "true"
-
-  Scenario: Retrieving message should include false isForwarded property when not set
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags "$Answered"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the isForwarded property of the message is "false"
-
-  Scenario: Retrieving message should be possible when message with inlined attachment but without content disposition
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with inlined attachments without content disposition
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-      |type     |application/octet-stream; name="encrypted.asc"   |
-      |cid      |null                                             |
-      |name     |encrypted.asc                                    |
-      |isInline |false                                            |
-
-  Scenario: Retrieving message should be possible when message with inlined image but without content disposition
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with inlined image without content disposition
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-      |type     |image/png; name=vlc.png                          |
-      |cid      |14672787885774e5c4d4cee471352039@linagora.com    |
-      |name     |vlc.png                                          |
-      |isInline |false                                            |
-
-  Scenario: Retrieving message should be possible when message with inlined attachment but without content ID
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with inlined image without content ID
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-    |type     |image/jpeg;	name=IMG_6112.JPG;	x-apple-part-url=B11616AF-86EB-47AF-863A-176A823498DB  |
-    |cid      |null                                                                                    |
-    |name     |IMG_6112.JPG                                                                            |
-    |isInline |false                                                                                   |
-
-  Scenario: Header only text calendar should be read as normal calendar attachment by JMAP
-    Given "alice@domain.tld" receives a SMTP message specified in file "eml/ics_in_header.eml" as message "m1"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the hasAttachment of the message is "true"
-    And the list of attachments of the message contains 1 attachments
-    And the first attachment is:
-    |type     |text/calendar; method=REPLY; charset=UTF-8; name=event.ics   |
-    |size     |1096                                                         |
-    |name     |event.ics                                                    |
-    |isInline |false                                                        |
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapKeywordsConsistency.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapKeywordsConsistency.feature
deleted file mode 100644
index 2c4df38546a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapKeywordsConsistency.feature
+++ /dev/null
@@ -1,138 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Impact of IMAP on JMAP keywords consistency
-
-  Background:
-    Given a domain named "domain.tld"
-    And a connected user "username@domain.tld"
-    And "username@domain.tld" has a mailbox "source"
-    And "username@domain.tld" has a mailbox "mailbox"
-    And "username@domain.tld" has a mailbox "trash"
-
-  Scenario Outline: GetMessages should union keywords when an inconsistency was created via IMAP
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "<mailbox>" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "<mailbox>"
-    When the user ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the keywords of the message is <keyword>
-
-    Examples:
-      |keyword                 | mailbox |
-      |$Flagged                | mailbox |
-      |$Flagged                | source  |
-
-  Scenario Outline: GetMessages should intersect Draft when an inconsistency was created via IMAP
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "<mailbox>" selected
-    And the user set flags via IMAP to "(\Draft)" for all messages in mailbox "<mailbox>"
-    When the user ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the keywords of the message is <keyword>
-
-    Examples:
-      |keyword     | mailbox |
-      |            | mailbox |
-      |            | source  |
-
-  Scenario: GetMessageList should return matching messageId when matching in at least 1 mailbox
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When the user asks for message list with flag "$Flagged"
-    Then the message list has size 1
-    And the message list contains "m1"
-
-  Scenario: GetMessageList in specific mailbox should return messageId when matching
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" asks for message list in mailbox "mailbox" with flag "$Flagged"
-    Then the message list has size 1
-    And the message list contains "m1"
-
-  Scenario: GetMessageList in specific mailbox should skip messageId when not matching
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" asks for message list in mailbox "source" with flag "$Flagged"
-    Then the message list is empty
-
-  Scenario: SetMessages should succeed to solve Keywords conflict introduced via IMAP upon flags addition (GetMessageList)
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" sets flags "$Flagged" on message "m1"
-    Then "username@domain.tld" asks for message list in mailbox "mailbox" with flag "$Flagged"
-    And the message list has size 1
-    And the message list contains "m1"
-    And "username@domain.tld" asks for message list in mailbox "source" with flag "$Flagged"
-    And the message list has size 1
-    And the message list contains "m1"
-
-  Scenario: SetMessages should succeed to solve Keywords conflict introduced via IMAP upon flags addition with GetMessages
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" sets flags "$Flagged" on message "m1"
-    Then the user ask for message "m1"
-    And no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the keywords of the message is $Flagged
-
-  Scenario: SetMessages should ignore Keywords conflict introduced via IMAP upon flags deletion with GetMessageList
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" sets flags "$Answered" on message "m1"
-    Then "username@domain.tld" asks for message list in mailbox "mailbox" with flag "$Flagged"
-    And the message list is empty
-    And "username@domain.tld" asks for message list in mailbox "source" with flag "$Flagged"
-    And the message list is empty
-    Then "username@domain.tld" asks for message list in mailbox "mailbox" with flag "$Answered"
-    And the message list has size 1
-    And the message list contains "m1"
-    And "username@domain.tld" asks for message list in mailbox "source" with flag "$Answered"
-    And the message list has size 1
-    And the message list contains "m1"
-
-  Scenario: SetMessages should ignore Keywords conflict introduced via IMAP upon flags deletion with GetMessages
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    And "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    And the user has an open IMAP connection with mailbox "mailbox" selected
-    And the user set flags via IMAP to "(\Flagged)" for all messages in mailbox "mailbox"
-    When "username@domain.tld" sets flags "$Answered" on message "m1"
-    Then the user ask for message "m1"
-    And no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-    And the keywords of the message is $Answered
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature
deleted file mode 100644
index b1baed8d44d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature
+++ /dev/null
@@ -1,67 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-
-Feature: IMAP compatibility of JMAP setMessages method used to update mailboxes
-  As a James user
-  I want to be able to access by IMAP messages moved and copied by JMAP
-
-  Background:
-    Given a domain named "domain.tld"
-    And a connected user "username@domain.tld"
-    And "username@domain.tld" has a mailbox "source"
-    And "username@domain.tld" has a mailbox "mailbox"
-    And "username@domain.tld" has a mailbox "trash"
-
-  Scenario: A message moved by JMAP is seen as moved by IMAP
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    When the user moves "m1" to user mailbox "mailbox"
-    Then the user has a IMAP message in mailbox "mailbox"
-    And the user does not have a IMAP message in mailbox "source"
-
-  Scenario: A message copied by JMAP is seen as copied by IMAP
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    When "username@domain.tld" copies "m1" from mailbox "source" to mailbox "mailbox"
-    Then the user has a IMAP message in mailbox "mailbox"
-    And the user has a IMAP message in mailbox "source"
-
-  Scenario: If a message is moved by JMAP, IMAP client will be notified when selecting mailbox
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    When the user moves "m1" to user mailbox "mailbox"
-    Then the user has a IMAP notification about 1 new message when selecting mailbox "mailbox"
-
-  Scenario: If a message is moved by JMAP, IMAP client that have selected the destination mailbox will be notified
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    Given the user has an open IMAP connection with mailbox "mailbox" selected
-    When the user moves "m1" to user mailbox "mailbox"
-    Then mailbox "mailbox" contains 1 messages
-    Then the user has a IMAP RECENT and a notification about 1 new messages on connection for mailbox "mailbox"
-
-  Scenario: If a message is copied by IMAP, JMAP should see the message and IMAP client that have selected the destination mailbox will be notified
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    Given the user has an open IMAP connection with mailbox "mailbox" selected
-    When the user copy by IMAP first message of "source" to mailbox "mailbox"
-    Then mailbox "mailbox" contains 1 messages
-    Then the user has a IMAP RECENT and a notification about 1 new messages on connection for mailbox "mailbox"
-
-
-  Scenario: If a message is moved by JMAP, IMAP client that have selected the source mailbox will not be notified
-    Given the user has a message "m1" in "source" mailbox with subject "My awesome subject", content "This is the content"
-    Given the user has an open IMAP connection with mailbox "source" selected
-    When the user moves "m1" to user mailbox "mailbox"
-    Then the user has IMAP EXPUNGE and a notification for 1 message sequence number on connection for mailbox "source"
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/MailboxModification.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/MailboxModification.feature
deleted file mode 100644
index ddebf9d0c00..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/MailboxModification.feature
+++ /dev/null
@@ -1,41 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-
-Feature: Mailbox modification
-  As a James user
-  I want a mailbox to be modified when I modify it
-  I want my mails to be kept when modifying a mailbox
-
-  Background:
-    Given a domain named "domain.tld"
-    And a connected user "username@domain.tld"
-
-  @BasicFeature
-  Scenario: Renaming a mailbox should keep messages
-    Given mailbox "A" with 2 messages
-    When renaming mailbox "A" to "B"
-    Then mailbox "B" contains 2 messages
-
-  @BasicFeature
-  Scenario: Moving a mailbox should keep messages
-    Given mailbox "A" with 2 messages
-    And mailbox "A.B" with 3 messages
-    And mailbox "B" with 4 messages
-    When moving mailbox "A.B" to "B"
-    Then mailbox "B.B" contains 3 messages
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/SetMessages.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/SetMessages.feature
deleted file mode 100644
index ca24d82fa9b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/SetMessages.feature
+++ /dev/null
@@ -1,111 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      * # under the License.                                           *
-# **************************************************************/
-Feature: SetMessages method
-  As a James user
-  I want to be able to modify properties of a mail
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "bob@domain.tld"
-    And "bob@domain.tld" has a mailbox "mailbox"
-    And "bob@domain.tld" has a message "mBob" in "mailbox" mailbox with two attachments in text
-
-# Flags update
-
-  @BasicFeature
-  Scenario: A user can update the flags on a message
-    Given "bob@domain.tld" sets flags "$Flagged,$Seen" on message "mBob"
-    When "bob@domain.tld" sets flags "$Flagged,$Forwarded" on message "mBob"
-    Then "bob@domain.tld" should see message "mBob" with keywords "$Flagged,$Forwarded"
-
-# Updating draft
-
-  Scenario: A user can update the flags on a draft
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" sets flags "$Draft,$Seen" on message "mDraft"
-    Then "bob@domain.tld" should see message "mDraft" with keywords "$Draft,$Seen"
-
-  Scenario: A user can remove a draft flag on a draft messages
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" sets flags "$Seen" on message "mDraft"
-    Then message "mDraft" is updated
-    And "bob@domain.tld" should see message "mDraft" with keywords "$Seen"
-
-  Scenario: A user can add a flag on a draft
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" marks the message "mDraft" as flagged
-    Then "bob@domain.tld" should see message "mDraft" with keywords "$Draft,$Flagged"
-
-  @BasicFeature
-  Scenario: A user can destroy a draft
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" destroys message "mDraft"
-    Then "bob@domain.tld" ask for message "mDraft"
-    And the notFound list should contain "mDraft"
-
-  Scenario: Draft creation in outbox is allowed
-    Given "bob@domain.tld" has a mailbox "Outbox"
-    When "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Outbox"
-    Then message "mDraft" is created
-
-  Scenario: Draft creation in any mailbox is allowed
-    Given "bob@domain.tld" has a mailbox "Outbox"
-    When "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "mailbox"
-    Then message "mDraft" is created
-
-  Scenario: A user can move draft out of draft mailbox
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" moves "mDraft" to user mailbox "mailbox"
-    Then message "mDraft" is updated
-
-  Scenario: A user can move draft out of draft mailbox when removing draft flag
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When the user moves "mDraft" to user mailbox "mailbox" and set flags ""
-    Then message "mDraft" is updated
-
-  Scenario: A user can move non-draft messages to draft mailbox when setting $Draft
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    When the user moves "mBob" to user mailbox "Drafts" and set flags "$Draft"
-    Then message "mBob" is updated
-
-  Scenario: A user can copy draft out of draft mailbox
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "bob@domain.tld" copies "mDraft" from mailbox "Drafts" to mailbox "mailbox"
-    Then message "mDraft" is updated
-
-  Scenario: A user can copy draft out of draft mailbox
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    When "bob@domain.tld" moves "mBob" to user mailbox "Drafts"
-    Then message "mBob" is updated
-
-  Scenario: A user can update $Draft keyword using isDraft property
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    When "bob@domain.tld" marks the message "mBob" as draft
-    Then message "mBob" is updated
-
-  Scenario: A user can copy draft out of draft mailbox
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    When "bob@domain.tld" copies "mBob" from mailbox "mailbox" to mailbox "Drafts"
-    Then message "mBob" is updated
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/UploadEndpoint.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/UploadEndpoint.feature
deleted file mode 100644
index 96788e87ba5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/UploadEndpoint.feature
+++ /dev/null
@@ -1,66 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-
-Feature: An upload endpoint should be available to upload contents
-  As a James user
-  I want to upload my attachments
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "username@domain.tld"
-
-  Scenario: An authenticated user should initiate the access to the upload endpoint
-    When "username@domain.tld" checks for the availability of the upload endpoint
-    Then the user should receive an authorized response
-
-  Scenario: An unauthenticated user should initiate the access to the download endpoint
-    When someone checks without authentification for the availability of the upload endpoint
-    Then the user should receive an authorized response
-
-  Scenario: Uploading a content without being authenticated
-    When someone upload a content without authentification
-    Then the user should receive a not authorized response
-
-  @Ignore
-  Scenario: Uploading a too big content
-    When "username@domain.tld" upload a too big content
-    Then the user should receive a request entity too large response
-
-  Scenario: Stoping an upload should work
-    Given "username@domain.tld" is starting uploading a content
-    When the user disconnect
-    Then the request should be marked as canceled
-
-  Scenario: Uploading a content being authenticated
-    When "username@domain.tld" upload a content
-    Then the user should receive a created response
-
-  Scenario: Uploading a content without content type should be denied
-    When "username@domain.tld" upload a content without content type
-    Then the user should receive bad request response
-
-  @BasicFeature
-  Scenario: Uploading a content, the content should be retrievable
-    When "username@domain.tld" upload a content
-    Then "username@domain.tld" should be able to retrieve the content
-
-  Scenario: Uploading a content, the server should respond specified JSON
-    When "username@domain.tld" upload a content
-    Then the user should receive a specified JSON content
-    
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/CopyAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/CopyAndSharing.feature
deleted file mode 100644
index dd8a0da80c8..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/CopyAndSharing.feature
+++ /dev/null
@@ -1,58 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Copy message and sharing
-  As a James user
-  I want that copying message work correctly with shared folder
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" has a mailbox "INBOX"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "bob@domain.tld" has a mailbox "bobMailbox"
-    And "bob@domain.tld" has a mailbox "INBOX"
-    And "alice@domain.tld" has a message "m1" in "INBOX" mailbox
-    And "bob@domain.tld" has a message "m2" in "bobMailbox" mailbox
-
-  Scenario: Copy message should update the total and the unread counts when asked by sharer
-    Given "alice@domain.tld" copies "m1" from mailbox "INBOX" to mailbox "shared"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  @BasicFeature
-  Scenario: Copy message should update the total and the unread counts when asked by sharer / sharee view
-    Given "alice@domain.tld" copies "m1" from mailbox "INBOX" to mailbox "shared"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Copy message should update the total and the unread counts when asked by sharee
-    Given "bob@domain.tld" copies "m2" from mailbox "bobMailbox" of user "bob@domain.tld" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Copy message should update the total and the unread counts when asked by sharee / sharee view
-    Given "bob@domain.tld" copies "m2" from mailbox "bobMailbox" of user "bob@domain.tld" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/DownloadAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/DownloadAndSharing.feature
deleted file mode 100644
index 5fd161cc0c7..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/DownloadAndSharing.feature
+++ /dev/null
@@ -1,43 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Download endpoint and shared mailbox
-  As a James user
-  I want to access to the download endpoint in order to download attachment from mail of mailbox that has been shared to me
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld, someone@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" mailbox "shared" contains a message "m1" with an attachment "a1"
-    And "alice@domain.tld" shares his mailbox "shared" with "bob@domain.tld" with "lr" rights
-
-  Scenario: Bob should have access to a shared attachment
-    Given "bob@domain.tld" is connected
-    When "bob@domain.tld" downloads "a1"
-    Then the user should be authorized
-
-  @BasicFeature
-  Scenario: Bob can download attachment of another user when shared mailbox
-    When "bob@domain.tld" downloads "a1"
-    Then he can read that blob
-    And the blob size is 3071
-
-  Scenario: Someone should not be able to download mail's attachment of mailbox shared to others
-    When "someone@domain.tld" downloads "a1"
-    Then "someone@domain.tld" should receive a not found response
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageAndSharing.feature
deleted file mode 100644
index 8789af54684..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageAndSharing.feature
+++ /dev/null
@@ -1,49 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: GetMessages method on shared mailbox
-  As a James user
-  I want to be able to retrieve messages contained by mailbox that has been shared to me
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld, someone@domain.tld"
-    And "alice@domain.tld" has a mailbox "INBOX"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "lr" rights
-    And "alice@domain.tld" has a message "m1" in "shared" mailbox with subject "my test subject", content "testmail"
-
-  @BasicFeature
-  Scenario: Retrieving a message in a mailbox delegated to me
-    When "bob@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-    And the id of the message is "m1"
-
-  Scenario: Retrieving a message in a mailbox delegated to someone else
-    When "someone@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list of messages is empty
-
-  Scenario: Retrieving a message in a mailbox not delegated to me
-    Given "alice@domain.tld" has a mailbox "notShared"
-    And "alice@domain.tld" has a message "m2" in "notShared" mailbox with subject "my test subject", content "testmail"
-    When "bob@domain.tld" ask for message "m2"
-    Then no error is returned
-    And the list should contain 0 message
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageListAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageListAndSharing.feature
deleted file mode 100644
index d86574dbfbf..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/GetMessageListAndSharing.feature
+++ /dev/null
@@ -1,60 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Listing message from shared mailbox
-  As a James user
-  I want to be able to see message from mailbox that has been shared to me or from mailbox I shared
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And a user "bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a mailbox "shared2"
-
-  Scenario: Sharer can read the total and unread counts on a shared folder
-    Given "alice@domain.tld" has a message "m1" in "shared" mailbox
-    And "alice@domain.tld" has a message "m2" in "shared" mailbox with subject "my test subject 2", content "testmail 2"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 2 messages
-    And the mailbox "shared" has 2 unseen messages
-
-  @BasicFeature
-  Scenario: Sharee can read the total and unread counts on a shared folder
-    Given "alice@domain.tld" has a message "m1" in "shared" mailbox
-    And "alice@domain.tld" has a message "m2" in "shared" mailbox with subject "my test subject 2", content "testmail 2"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 2 messages
-    And the mailbox "shared" has 2 unseen messages
-
-  Scenario: As sharee read a message it should not update unseen count when no rights and read by sharee
-    Given "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lri" rights
-    And "alice@domain.tld" has a message "m1" in "shared2" mailbox
-    When "bob@domain.tld" sets flags "$Seen" on message "m1"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared2" has 1 message
-    And the mailbox "shared2" has 1 unseen message
-
-  Scenario: Lookup right should not be enough to read message and unseen counts
-    Given "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "l" rights
-    And "alice@domain.tld" has a message "m1" in "shared2" mailbox
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared2" has 0 messages
-    And the mailbox "shared2" has 0 unseen messages
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/KeywordsConsistencyOnDelegationMailbox.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/KeywordsConsistencyOnDelegationMailbox.feature
deleted file mode 100644
index b83154dea15..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/KeywordsConsistencyOnDelegationMailbox.feature
+++ /dev/null
@@ -1,140 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Keywords consistency on delegation mailbox
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "notShared"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares its mailbox "shared" with rights "lrw" with "bob@domain.tld"
-    And "alice@domain.tld" has a message "m1" in "notShared" mailbox with subject "My awesome subject", content "This is the content"
-    And "alice@domain.tld" copies "m1" from mailbox "notShared" to mailbox "shared"
-
-  Scenario: getMessageList filtered by flag should combine flag when delegation mailbox
-    Given "bob@domain.tld" sets flags "$Flagged" on message "m1"
-    When "alice@domain.tld" asks for message list in mailboxes "shared,notShared" with flag "$Flagged"
-    Then the message list contains "m1"
-
-  Scenario: getMessageList filtered by flag should keep flag on non-shared mailbox
-    Given "bob@domain.tld" sets flags "$Flagged" on message "m1"
-    When "alice@domain.tld" asks for message list in mailboxes "notShared" with flag "$Flagged"
-    Then the message list is empty
-
-  Scenario: getMessageList filtered by flag should keep flag on delegation mailbox
-    Given "bob@domain.tld" sets flags "$Flagged" on message "m1"
-    When "alice@domain.tld" asks for message list in mailboxes "shared" with flag "$Flagged"
-    Then the message list contains "m1"
-
-  Scenario: Get message list should select Draft flag on all mailbox
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" asks for message list in mailboxes "shared,notShared" with flag "$Draft"
-    Then the message list contains "m1"
-
-  Scenario: Get message list should keep flags on non-shared mailbox
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" asks for message list in mailbox "notShared" with flag "$Draft"
-    Then the message list is empty
-
-  Scenario: Get message list should keep flags on shared mailbox
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" asks for message list in mailbox "shared" with flag "$Draft"
-    Then the message list contains "m1"
-
-  Scenario: getMessage with shared user should return message with combine flag when delegation mailbox
-    Given message "m1" has flags $Flagged in mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Flagged
-
-  Scenario: getMessage of owner mailbox should return message with combine flag when delegation mailbox
-    Given message "m1" has flags $Flagged in mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Flagged
-
-  Scenario: message should update message status based on delegation mailbox
-    Given "alice@domain.tld" sets flags "$Flagged,$Seen" on message "m1"
-    And "bob@domain.tld" sets flags "$Seen" on message "m1"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has IMAP flag "\Flagged \Seen" in mailbox "notShared" for "alice@domain.tld"
-    And the message has IMAP flag "\Seen" in mailbox "shared" for "alice@domain.tld"
-
-  Scenario: message should keep origin message status when cut the sharing
-    Given "bob@domain.tld" sets flags "$Flagged" on message "m1"
-    And "alice@domain.tld" shares its mailbox "shared" with rights "" with "bob@domain.tld"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has IMAP flag "\Flagged" in mailbox "shared" for "alice@domain.tld"
-    And the message has IMAP flag "" in mailbox "notShared" for "alice@domain.tld"
-
-  Scenario: getMessage should keep origin message status when delegation mailbox
-    Given message "m1" has flags $Flagged in mailbox "notShared" of user "alice@domain.tld"
-    And message "m1" has flags $Seen in mailbox "shared" of user "alice@domain.tld"
-    And "alice@domain.tld" shares its mailbox "shared" with rights "" with "bob@domain.tld"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Flagged,$Seen
-
-  Scenario: getMessage on mailbox should keep its flag as it is when owner
-    Given "alice@domain.tld" sets flags "$Flagged" on message "m1"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has IMAP flag "\Flagged" in mailbox "shared" for "alice@domain.tld"
-    And the message has IMAP flag "\Flagged" in mailbox "notShared" for "alice@domain.tld"
-
-  Scenario: messages should keep Draft flag as it is when onwer
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Draft
-
-  Scenario: message should intersect flag when Draft
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has no keyword
-
-  Scenario: message should intersect flag when Draft after cut sharing
-    Given message "m1" has flags $Draft in mailbox "shared" of user "alice@domain.tld"
-    And "alice@domain.tld" shares its mailbox "shared" with rights "" with "bob@domain.tld"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has no keyword
-
-  Scenario: message should combine flag if not Draft
-    Given the user has an open IMAP connection with mailbox "shared" selected
-    And the user set flags via IMAP to "\FLAGGED" for all messages in mailbox "shared"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Flagged
-
-  Scenario: message should combine flag if not Draft on all mailboxes
-    Given "alice@domain.tld" sets flags "$Flagged" on message "m1"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the keywords of the message is $Flagged
-
-  Scenario: message should intersect Draft flag with onwer mailbox
-    Given the user has an open IMAP connection with mailbox "shared" selected
-    And the user set flags via IMAP to "\DRAFT" for all messages in mailbox "shared"
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the message has no keyword
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxCreationAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxCreationAndSharing.feature
deleted file mode 100644
index 989fed47432..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxCreationAndSharing.feature
+++ /dev/null
@@ -1,40 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Mailbox creation and sharing
-  As a James user
-  I don't want other user to create mailbox in my mailbox even I shared it to them
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-
-  Scenario: A sharee should not be able to update shared mailbox rights
-    When "bob@domain.tld" shares "alice@domain.tld" delegated mailbox "shared" with rights "aeilrwt" with "bob@domain.tld"
-    Then mailbox "shared" owned by "alice@domain.tld" is not updated
-
-  Scenario: A sharee should not be able to create a shared mailbox child
-    Given "bob@domain.tld" creates mailbox "sharedChild" with creationId "c-01" in mailbox "shared" owned by "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Personal" namespace
-
-  Scenario: A sharee should receive a not created response when trying to create a shared mailbox child
-    When "bob@domain.tld" creates mailbox "sharedChild" with creationId "c-01" in mailbox "shared" owned by "alice@domain.tld"
-    Then mailbox with creationId "c-01" is not created
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxDeletionAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxDeletionAndSharing.feature
deleted file mode 100644
index 5a9543c5d5e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MailboxDeletionAndSharing.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Mailbox deletion and shared mailbox
-  As a James user I don't want user to delete the mailbox I share to them
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And a user "bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-
-  Scenario: A sharee should receive a not destroyed response when trying to destroy a shared mailbox
-    Given "bob@domain.tld" deletes the mailbox "shared" owned by "alice@domain.tld"
-    Then mailbox "shared" owned by "alice@domain.tld" is not destroyed
-
-  Scenario: A sharee should not be able to delete a shared mailbox
-    Given "bob@domain.tld" deletes the mailbox "shared" owned by "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Personal" namespace
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMailboxAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMailboxAndSharing.feature
deleted file mode 100644
index 02e0324db1c..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMailboxAndSharing.feature
+++ /dev/null
@@ -1,77 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Moving mailbox and sharing
-  As a James user
-  I want that moving shared mailbox work correctly
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a mailbox "shared.sharedChild"
-    And "alice@domain.tld" shares her mailbox "shared.sharedChild" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a mailbox "otherShared"
-    And "alice@domain.tld" shares her mailbox "otherShared" with "bob@domain.tld" with "aeilrwt" rights
-    And "bob@domain.tld" has a mailbox "bobMailbox"
-
-  Scenario: A sharer can not move its mailboxes to someone else delegated mailboxes
-    And "bob@domain.tld" shares her mailbox "bobMailbox" with "alice@domain.tld" with "aeilrwt" rights
-    When "alice@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "bobMailbox" owned by "bob@domain.tld"
-    Then mailbox "shared.sharedChild" owned by "alice@domain.tld" is not updated
-
-  Scenario: A sharee moving a delegated mailbox as top level should be rejected
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld" as top level mailbox
-    Then mailbox "shared.sharedChild" owned by "alice@domain.tld" is not updated
-
-  Scenario: A sharee moving a delegated mailbox as top level should not move mailbox
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld" as top level mailbox
-    Then "alice@domain.tld" lists mailboxes
-    And the mailboxes should contain "sharedChild" in "Personal" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-
-  Scenario: A sharee moving a delegated mailbox into sharer mailboxes should be rejected
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "otherShared" owned by "alice@domain.tld"
-    Then mailbox "shared.sharedChild" owned by "alice@domain.tld" is not updated
-
-  Scenario: A sharee moving a delegated mailbox into another delegated mailbox should not move mailbox
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "otherShared" owned by "alice@domain.tld"
-    Then "alice@domain.tld" lists mailboxes
-    And the mailboxes should contain "sharedChild" in "Personal" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-
-  Scenario: A sharee moving a delegated mailbox to his mailboxes should be rejected
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "bobMailbox" owned by "bob@domain.tld"
-    Then mailbox "shared.sharedChild" owned by "alice@domain.tld" is not updated
-
-  Scenario: A sharee moving a delegated mailbox into his mailbox should not move mailbox
-    When "bob@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "bobMailbox" owned by "bob@domain.tld"
-    Then "alice@domain.tld" lists mailboxes
-    And the mailboxes should contain "sharedChild" in "Personal" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-
-  Scenario: A sharee should be able to retrieve a mailbox after sharer moved it as a top level mailbox
-    When "alice@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld" as top level mailbox
-    Then "bob@domain.tld" lists mailboxes
-    And the mailboxes should contain "sharedChild" in "Delegated" namespace, with no parent mailbox
-
-  @BasicFeature
-  Scenario: A sharee should be able to retrieve a mailbox after sharer moved it into another mailbox
-    Given "alice@domain.tld" has a mailbox "notShared"
-    When "alice@domain.tld" moves the mailbox "shared.sharedChild" owned by "alice@domain.tld", into mailbox "notShared" owned by "alice@domain.tld"
-    Then "bob@domain.tld" lists mailboxes
-    And the mailboxes should contain "sharedChild" in "Delegated" namespace, with parent mailbox "notShared" of user "alice@domain.tld"
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMessageAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMessageAndSharing.feature
deleted file mode 100644
index 3b7b4e2fb0b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/MoveMessageAndSharing.feature
+++ /dev/null
@@ -1,149 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Move message and sharing
-  As a James user
-  I want that moving message work correctly with shared folder
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" has a mailbox "INBOX"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "bob@domain.tld" has a mailbox "bobMailbox"
-    And "bob@domain.tld" has a mailbox "INBOX"
-
-  Scenario: Move message should update the total and the unread counts when asked by sharer
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox
-    And "alice@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Move message should update the total and the unread counts of origin mailbox when asked by sharer
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox
-    And "alice@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "INBOX" has 0 messages
-    And the mailbox "INBOX" has 0 unseen messages
-
-  Scenario: Move message should update the total and the unread counts when asked by sharer / sharee view
-    Given "alice@domain.tld" has a message "m1" in "INBOX" mailbox
-    And "alice@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Move message should update the total and the unread counts of origin mailbox when asked by sharer / sharee view
-    Given "alice@domain.tld" has a mailbox "sharedBis"
-    And "alice@domain.tld" has a message "m1" in "sharedBis" mailbox
-    And "alice@domain.tld" shares her mailbox "sharedBis" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "sharedBis" has 0 messages
-    And the mailbox "sharedBis" has 0 unseen messages
-
-  Scenario: Move message should update the total and the unread counts when asked by sharee
-    Given "bob@domain.tld" has a message "m1" in "bobMailbox" mailbox
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Move message should update the total and the unread counts of origin mailbox when asked by sharee
-    Given "bob@domain.tld" has a mailbox "sharedBis"
-    And "bob@domain.tld" has a message "m1" in "sharedBis" mailbox
-    And "bob@domain.tld" shares her mailbox "sharedBis" with "alice@domain.tld" with "aeilrwt" rights
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "sharedBis" has 0 messages
-    And the mailbox "sharedBis" has 0 unseen messages
-
-  @BasicFeature
-  Scenario: Move message should update the total and the unread counts when asked by sharee / sharee view
-    Given "bob@domain.tld" has a message "m1" in "bobMailbox" mailbox
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 1 unseen message
-
-  Scenario: Move message should update the total and the unread counts of origin mailbox when asked by sharee / sharee view
-    Given "bob@domain.tld" has a message "m1" in "bobMailbox" mailbox
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "bobMailbox" has 0 messages
-    And the mailbox "bobMailbox" has 0 unseen messages
-
-  Scenario: Moving a message to a delegated mailbox without rights should not change the total and the unread counts
-    Given "alice@domain.tld" has a mailbox "shared2"
-    And "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lr" rights
-    And "bob@domain.tld" has a message "m1" in "bobMailbox" mailbox
-    And "bob@domain.tld" moves "m1" to mailbox "shared2" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 0 messages
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Moving a message to a delegated mailbox without rights should not change the total and the unread counts / sharee view
-    Given "alice@domain.tld" has a mailbox "shared2"
-    And "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lr" rights
-    And "bob@domain.tld" has a message "m1" in "bobMailbox" mailbox
-    And "bob@domain.tld" moves "m1" to mailbox "shared2" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 0 messages
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Move message should update the total and the unread counts when asked by sharee and seen message
-    Given "bob@domain.tld" has a message "m1" in the "bobMailbox" mailbox with flags "$Seen"
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen message
-
-  Scenario: Move message should update the total and the unread counts when asked by sharee / sharee view and seen message
-    Given "bob@domain.tld" has a message "m1" in the "bobMailbox" mailbox with flags "$Seen"
-    And "bob@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen message
-
-  Scenario: Move message should update the total and the unread counts of origin mailbox when asked by sharer and seen message
-    Given "alice@domain.tld" has a message "m1" in the "INBOX" mailbox with flags "$Seen"
-    And "alice@domain.tld" moves "m1" to mailbox "shared" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "INBOX" has 0 messages
-    And the mailbox "INBOX" has 0 unseen messages
-
-  Scenario: Moving a message to a delegated mailbox without rights should not change the total and the unread counts
-    Given "alice@domain.tld" has a mailbox "shared2"
-    And "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lri" rights
-    And "bob@domain.tld" has a message "m1" in the "bobMailbox" mailbox with flags "$Seen"
-    And "bob@domain.tld" moves "m1" to mailbox "shared2" of user "alice@domain.tld"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 0 messages
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Moving a message to a delegated mailbox without rights should not change the total and the unread counts / sharee view
-    Given "alice@domain.tld" has a mailbox "shared2"
-    And "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lri" rights
-    And "bob@domain.tld" has a message "m1" in the "bobMailbox" mailbox with flags "$Seen"
-    And "bob@domain.tld" moves "m1" to mailbox "shared2" of user "alice@domain.tld"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 0 messages
-    And the mailbox "shared" has 0 unseen messages
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/RenamingMailboxAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/RenamingMailboxAndSharing.feature
deleted file mode 100644
index 8893bce6889..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/RenamingMailboxAndSharing.feature
+++ /dev/null
@@ -1,49 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Renaming mailbox and sharing
-  As a James user
-  I want that renaming shared mailbox work properly
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-
-  @BasicFeature
-  Scenario: A sharee should be able to access a shared mailbox after it has been renamed by the owner
-    Given "alice@domain.tld" renames her mailbox "shared" to "mySharedMailbox"
-    When "bob@domain.tld" lists mailboxes
-    Then the mailboxes should contain "mySharedMailbox" in "Delegated" namespace
-
-  Scenario: A sharee should not be able to rename a shared mailbox
-    Given "bob@domain.tld" renames the mailbox, owned by "alice@domain.tld", "shared" to "mySharedMailbox"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Personal" namespace
-
-  Scenario: A user should not be able to rename an other user mailbox
-    Given "alice@domain.tld" has a mailbox "mySecrets"
-    And "bob@domain.tld" renames the mailbox, owned by "alice@domain.tld", "mySecrets" to "revealMySecrets"
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "mySecrets" in "Personal" namespace
-
-  Scenario: A sharee should receive a not updated response when trying to rename a shared mailbox
-    Given "bob@domain.tld" renames the mailbox, owned by "alice@domain.tld", "shared" to "mySharedMailbox"
-    Then mailbox "shared" owned by "alice@domain.tld" is not updated
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetFlagAndSharing.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetFlagAndSharing.feature
deleted file mode 100644
index 4d857c93b8d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetFlagAndSharing.feature
+++ /dev/null
@@ -1,62 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Set flag and sharing
-  As a James user
-  I want that set flag work correctly with shared mailbox
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a message "m1" in "shared" mailbox
-
-  Scenario: Set flags by sharer should update unseen count when read by sharer
-    When "alice@domain.tld" sets flags "$Seen" on message "m1"
-    And "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen messages
-
-  @BasicFeature
-  Scenario: Set flags by sharer should update unseen count when read by sharee
-    When "alice@domain.tld" sets flags "$Seen" on message "m1"
-    And "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Set flags by sharee should update unseen count when read by sharer
-    When "bob@domain.tld" sets flags "$Seen" on message "m1"
-    And "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Set flags by sharee should update unseen count when read by sharee
-    When "bob@domain.tld" sets flags "$Seen" on message "m1"
-    And "bob@domain.tld" lists mailboxes
-    Then the mailbox "shared" has 1 message
-    And the mailbox "shared" has 0 unseen messages
-
-  Scenario: Set flags by sharee should not update unseen count when no rights and read by sharer
-    Given "alice@domain.tld" has a mailbox "shared2"
-    And "alice@domain.tld" shares her mailbox "shared2" with "bob@domain.tld" with "lri" rights
-    And "alice@domain.tld" has a message "m2" in "shared2" mailbox
-    When "bob@domain.tld" sets flags "$Seen" on message "m2"
-    And "alice@domain.tld" lists mailboxes
-    Then the mailbox "shared2" has 1 message
-    And the mailbox "shared2" has 1 unseen message
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetMessagesOnSharedMailbox.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetMessagesOnSharedMailbox.feature
deleted file mode 100644
index cd18dc1ba58..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SetMessagesOnSharedMailbox.feature
+++ /dev/null
@@ -1,112 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: SetMessages method on shared folders
-  As a James user
-  I want to be able to modify properties of a shared mail
-
-  Background:
-    Given a domain named "domain.tld"
-    And some users "alice@domain.tld, bob@domain.tld"
-    And "bob@domain.tld" has a mailbox "shared"
-    And "bob@domain.tld" has a mailbox "Outbox"
-    And "alice@domain.tld" has a mailbox "INBOX"
-    And "bob@domain.tld" has a message "mBob" in "shared" mailbox with two attachments in text
-    And "alice@domain.tld" has a message "mAlice" in "INBOX" mailbox with two attachments in text
-
-  @BasicFeature
-  Scenario: A delegated user can copy messages from shared mailbox when having "read" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lr" rights
-    And "alice@domain.tld" copies "mBob" from mailbox "shared" of user "bob@domain.tld" to mailbox "INBOX" of user "alice@domain.tld"
-    Then "alice@domain.tld" should see message "mBob" in mailboxes:
-        |alice@domain.tld |INBOX  |
-        |bob@domain.tld   |shared |
-
-  @BasicFeature
-  Scenario: A delegated user can move messages out of shared mailbox when having "read" and "delete" rights
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lrte" rights
-    And "alice@domain.tld" moves "mBob" to mailbox "INBOX" of user "alice@domain.tld"
-    Then "alice@domain.tld" should see message "mBob" in mailboxes:
-        |alice@domain.tld |INBOX  |
-
-  @BasicFeature
-  Scenario: A delegated user can add messages to a shared mailbox when having "insert" rights
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lri" rights
-    And "alice@domain.tld" copies "mAlice" from mailbox "INBOX" of user "alice@domain.tld" to mailbox "shared" of user "bob@domain.tld"
-    Then "alice@domain.tld" should see message "mAlice" in mailboxes:
-        |alice@domain.tld |INBOX  |
-        |bob@domain.tld   |shared |
-
-  Scenario: A delegated user can add messages with keywords to a shared mailbox when having "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lriws" rights
-    And "alice@domain.tld" sets flags "$Flagged" on message "mAlice"
-    And "alice@domain.tld" moves "mAlice" to mailbox "shared" of user "bob@domain.tld"
-    Then "alice@domain.tld" should see message "mAlice" with keywords "$Flagged"
-
-  Scenario: A delegated user can add sanitized messages to a shared mailbox when missing "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lri" rights
-    And "alice@domain.tld" sets flags "$Flagged" on message "mAlice"
-    And "alice@domain.tld" moves "mAlice" to mailbox "shared" of user "bob@domain.tld"
-    Then "alice@domain.tld" should see message "mAlice" without keywords
-
-  Scenario: A delegated user can not copy messages from shared mailbox when missing "read" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "litewsa" rights
-    When "alice@domain.tld" copies "mBob" from mailbox "shared" of user "bob@domain.tld" to mailbox "INBOX" of user "alice@domain.tld"
-    Then message "mBob" is not updated
-
-  Scenario: A delegated user can not copy messages to shared mailbox when missing "insert" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lrtewsa" rights
-    When "alice@domain.tld" copies "mAlice" from mailbox "INBOX" of user "alice@domain.tld" to mailbox "shared" of user "bob@domain.tld"
-    Then message "mAlice" is not updated
-
-  Scenario: A delegated user can not move messages out of shared mailbox when missing "delete" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lriwsa" rights
-    When "alice@domain.tld" moves "mBob" to mailbox "INBOX" of user "alice@domain.tld"
-    Then message "mBob" is not updated
-
-  @BasicFeature
-  Scenario: A delegated user add keywords on a delegated message when having "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lrw" rights
-    When "alice@domain.tld" sets flags "$Flagged" on message "mBob"
-    Then "alice@domain.tld" should see message "mBob" with keywords "$Flagged"
-
-  Scenario: A delegated user can not add keywords on a delegated message when missing "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "latires" rights
-    When "alice@domain.tld" sets flags "$Flagged" on message "mBob"
-    Then message "mBob" is not updated
-
-  @BasicFeature
-  Scenario: A delegated user remove keywords on a delegated message when having "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "lrw" rights
-    And "bob@domain.tld" sets flags "$Flagged" on message "mBob"
-    When "alice@domain.tld" sets flags "" on message "mBob"
-    Then "alice@domain.tld" should see message "mBob" without keywords
-
-  Scenario: A delegated user can not remove keywords on a delegated message when missing "write" right
-    Given "bob@domain.tld" shares his mailbox "shared" with "alice@domain.tld" with "latires" rights
-    And "bob@domain.tld" sets flags "$Flagged" on message "mBob"
-    When "alice@domain.tld" sets flags "" on message "mBob"
-    Then message "mBob" is not updated
-
-  Scenario: A delegated user can not move draft from draft mailbox to outbox
-    Given "bob@domain.tld" has a mailbox "Drafts"
-    And "bob@domain.tld" tries to create a draft message "mDraft" in mailbox "Drafts"
-    When "alice@domain.tld" moves "mDraft" to mailbox "Outbox" of user "bob@domain.tld"
-    Then message "mDraft" is not updated
-    And message "mBob" has flags $Draft in mailbox "Drafts" of user "bob@domain.tld"
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingChildrenWithoutSharingParent.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingChildrenWithoutSharingParent.feature
deleted file mode 100644
index 641de315841..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingChildrenWithoutSharingParent.feature
+++ /dev/null
@@ -1,42 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Sharing children mailbox
-  As a James user
-  I want to be able to share a children mailbox without sharing it's parent one
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And a user "bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a mailbox "mailbox1"
-    And "alice@domain.tld" has a mailbox "mailbox1.shared"
-
-  Scenario: User can share sub-mailbox without sharing its parent
-    Given "alice@domain.tld" shares her mailbox "mailbox1.shared" with "bob@domain.tld" with "aeirwt" rights
-    When "bob@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Delegated" namespace
-    And the mailboxes should not contain "mailbox1"
-
-  Scenario: User can share sub-mailbox without sharing its parent and then sharee can see the parent mailbox
-    Given "alice@domain.tld" shares her mailbox "mailbox1.shared" with "bob@domain.tld" with "l" rights
-    When "bob@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Delegated" namespace
-    And the mailboxes should contain "mailbox1" in "Delegated" namespace
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingMailboxWithOtherDomain.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingMailboxWithOtherDomain.feature
deleted file mode 100644
index 31a4424cc22..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingMailboxWithOtherDomain.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Delegation with other domain
-  As a James user I can not share a mailbox with a other from an other domain
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-
-  Scenario: alice should not be able to share her mailbox with a user from an other domain
-    Given a domain named "otherdomain.tld"
-    And a user "bob@otherdomain.tld"
-    When "alice@domain.tld" shares its mailbox "shared" with rights "lrw" with "bob@otherdomain.tld"
-    Then "alice@domain.tld" receives not updated on mailbox "shared" with kind "invalidArguments" and message "Cannot share a mailbox to another domain"
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingParentMailboxWithAndWithoutChildren.feature b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingParentMailboxWithAndWithoutChildren.feature
deleted file mode 100644
index b17be557174..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/cucumber/sharing/SharingParentMailboxWithAndWithoutChildren.feature
+++ /dev/null
@@ -1,112 +0,0 @@
-#***************************************************************
-# Licensed to the Apache Software Foundation (ASF) under one   *
-# or more contributor license agreements.  See the NOTICE file *
-# distributed with this work for additional information        *
-# regarding copyright ownership.  The ASF licenses this file   *
-# to you under the Apache License, Version 2.0 (the            *
-# "License"); you may not use this file except in compliance   *
-# with the License.  You may obtain a copy of the License at   *
-#                                                              *
-#   http://www.apache.org/licenses/LICENSE-2.0                 *
-#                                                              *
-# Unless required by applicable law or agreed to in writing,   *
-# software distributed under the License is distributed on an  *
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-# KIND, either express or implied.  See the License for the    *
-# specific language governing permissions and limitations      *
-# under the License.                                           *
-# **************************************************************/
-Feature: Share parent mailbox without sharing submailbox
-  As a James user
-  I want to be able to retrieve my mailboxes
-
-  Background:
-    Given a domain named "domain.tld"
-    And a user "alice@domain.tld"
-    And a user "bob@domain.tld"
-    And "alice@domain.tld" has a mailbox "shared"
-    And "alice@domain.tld" has a mailbox "shared.secret"
-    And "alice@domain.tld" has a mailbox "shared.notsecret"
-    And "alice@domain.tld" shares her mailbox "shared" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" shares her mailbox "shared.notsecret" with "bob@domain.tld" with "aeilrwt" rights
-    And "alice@domain.tld" has a message "m1" in "shared" mailbox
-    And "alice@domain.tld" has a message "m2" in "shared.secret" mailbox
-    And "alice@domain.tld" has a message "m3" in "shared.notsecret" mailbox
-
-  Scenario: Bob can see shared mailbox and explicitly shared children mailbox
-    When "bob@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Delegated" namespace
-    And the mailboxes should contain "notsecret" in "Delegated" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-    And the mailbox "shared" has 1 messages
-    And the mailbox "notsecret" has 1 messages
-
-  Scenario: Bob can not see not explicitly shared children mailbox
-    When "bob@domain.tld" lists mailboxes
-    Then the mailboxes should not contain "shared.secret" in "Delegated" namespace
-    And the mailboxes should not contain "secret" in "Personal" namespace
-    And the mailboxes should not contain "secret" in "Delegated" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-
-  Scenario: Alice can see all her shared mailbox
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "shared" in "Personal" namespace
-    And the mailboxes should contain "notsecret" in "Personal" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-    And the mailbox "shared" has 1 messages
-    And the mailbox "notsecret" has 1 messages
-
-  Scenario: Alice can see all her not shared mailbox
-    When "alice@domain.tld" lists mailboxes
-    Then the mailboxes should contain "secret" in "Personal" namespace, with parent mailbox "shared" of user "alice@domain.tld"
-    And the mailbox "secret" has 1 messages
-
-  Scenario: Alice can get message from her root shared mailbox
-    When "alice@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-
-  Scenario: Alice can get message from her children shared mailbox
-    When "alice@domain.tld" ask for message "m3"
-    Then no error is returned
-    And the list should contain 1 message
-
-  Scenario: Alice can get message from her not shared mailbox
-    When "alice@domain.tld" ask for message "m2"
-    Then no error is returned
-    And the list should contain 1 message
-
-  Scenario: Bob can get message from root shared mailbox
-    When "bob@domain.tld" ask for message "m1"
-    Then no error is returned
-    And the list should contain 1 message
-
-  Scenario: Bob can get message from children shared mailbox
-    When "bob@domain.tld" ask for message "m3"
-    Then no error is returned
-    And the list should contain 1 message
-
-  Scenario: Bob can not get message from mailbox not shared with him
-    When "bob@domain.tld" ask for message "m2"
-    Then the list should contain 0 message
-
-  Scenario: Alice can list message from her shared root mailbox
-    When "alice@domain.tld" asks for message list in mailbox "shared"
-    Then the message list has size 1
-
-  Scenario: Alice can list message from her shared children mailbox
-    When "alice@domain.tld" asks for message list in mailbox "shared.notsecret"
-    Then the message list has size 1
-
-  Scenario: Alice can list message from all her mailbox she is not sharing
-    When "alice@domain.tld" asks for message list in mailbox "shared.secret"
-    Then the message list has size 1
-
-  Scenario: Bob can list message from root mailbox that are shared to him
-    When "bob@domain.tld" asks for message list in delegated mailbox "shared" from "alice@domain.tld"
-    Then the message list has size 1
-
-  Scenario: Bob can list message from children mailbox that are shared to him
-    When "bob@domain.tld" asks for message list in delegated mailbox "shared.notsecret" from "alice@domain.tld"
-    Then the message list has size 1
-
-  Scenario: Bob can not list message from mailbox that are not shared to him
-    When "bob@domain.tld" asks for message list in delegated mailbox "shared.secret" from "alice@domain.tld"
-    Then the message list has size 0
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/attachment.pdf b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/attachment.pdf
deleted file mode 100644
index 6db56a2cc0aaeab28a3ce84f6ce11b6d5a86d92f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9404
zcmai4by$?!x<>((p}S@15@#5OVdw@$8U*Paa>yCF8w8|92_;1k$q}R_M35F#K<Vz1
zt~+@4*=O&w?|ts~@XcE5{oY=`wfN(GIW-lO1O)Fw0i5jx?Tzg<?JofkAQ<Rk=>U+B
z0I4FJZP9i>AuL53q-2joBiunsNDDMV0b%80jgXQ8pwR9J3nzegmRj5c!Zt8j_|`GC
zAC0!{FozQmue9c-OGNO^oy9q>(b%9V35A}v&Gr7;u*ekwQ#?8C&gV*6<#j9ebuq({
zFTOr_C(%I`QQ5sJmObrVxY5z^c=mj~Rn~_GBWp-XOgY-Vm`VKQsNSoN_t)`Hn~l)*
z=4WM_B+lo8);$(11t*0LOsigFok0pA+;MRfiFKjx_svPty{W9Is-Lak3L3+_00?L6
zKitL6t|A0n1$H$Ngh8*q{-z24BYfEZ5&j?P5d;bf3W1@2O~!(+qps2S=gX6)OaziR
z%pn}`TZ2iYvz!DLcsG##iPu8FPXtU!MqBUQ*ok)f0Q}*0`#Z+t_D8oqOkIC_vxu|a
z_>UjIo{*|@_1KFE8}MiMm%`qOr=Z8}zjzx?J@-qO->_ktDuYL!ZU}_LXVy4Q)HzPD
z96l0T^4r=vJ*YjrAaVEKl_4t3v+v0L@S%BGA*X|rH9Rnmte*}}m;RLDdhlG&E%G0O
z9ox;8m!P0nvO~XcZD_k6Dd{`irW5(_xE#v>a}FBjv-Ko1T{aF$oNy0znPmfstm{WY
z!L)JfvC_W;;;V0L?*&I4JRw#1p5D?-!^)lW+STk=Zp>wgWIwJc(R(P(1nmz7KLT_%
zYdG47tFve}?6o;TE`@_e#<Msz|Ef6y=IQc~Ah#TgBjs{koOe{*OyxtbmVe!_axkpF
z56-_FxZCGut;pJ^WGzRz-n=^79Hww$d}6mB;MVh{=u)I<kn{FHu1ntcLAPIoBk9)A
zd@zIJ&0zP#eVP+q%@t}T@xj`mUKYVqX7ueNg1TE`Aulf3-7S9I@ufa@{mNs3A(gz|
zd`5kOZyI|+qJm%wi1Sz`T)t_(Z<RA~==18H*w08hIGT1peVIx$5|+XrETJLVp^Wzn
zCKm4%vH<V!@#mbamj<73_!4bq+u<?eJu}IOe|b*%1$54+uunH0*BlMYZSu1BCvEAX
zH@~PKj7=P_rR%HhRV8pEP5w?$cP=b*ah<qb<T0zKd)ANe45$s!8&0zIjg`&Sbvsg*
zAHGvhYx>^iK3z1|v1)%M(^OUI+<r2ivFh>Au_pjws^O-U`$ooe4sC7J8_Fx$XE(T}
zjbV7fPUjQqj#AJjWal&EiIOvY+@l3l*kV)ACAio32BFK_)=}^^`C1}Vy)q;*k*M^Z
zrEH13hiL*;D(8MSmw{M<7v>Phzw!QN+6exQsZZw3iLCa)@a!B`{A%S44r=9soN<3w
zYc4wb>wYLD`TU=BLf(>g{pNUsw-OESX!Ool;tK^+-TXd4Uhp8ly(EjDj#;;TL$Z~t
zVR&q9A5*g8PHB~^WTX8RR>Ip`097$j{!}13aMnA#gpU!QRcB7UnNRxbwJ{ai_Wg8k
zZ%WD7+oxS>4&CkgRjj+uR+BPAOEL|e)*jIpZS*HT`uZNvAmbQM7QWl2{DyakLvf8l
zN|p*4`K!Md+M~UvYR%;vXzyElhhVqY*kQF-feaGYCYj?AxYF=x-C=LIsf3KabuFb8
z=7lMKz9H_XJL~XNDNiOuqiMagQoOIJ2Qnkwsg!u@-p%=um4Xl!aTb||Yg$D={3zas
zd;S>64IY?ylYDET7lbOENEK@8HPA}v0%tm9OA7IAIWVV&CC*uCdH9Nq42PlltYy_&
z?7cn<(c2V%``%;Cxn1Jns;ey=kw`OGZ*+|>qNMj0(fyX^-gibVg5^+=y8L1E4%|F9
z*}Df?laOGbkEBCa_Op|++roo*GQf<i{AuGlQfMCev%DcLSU`!!3rzv{_Rs#>wW0ah
zlB%4=uM8O;QqkXYC~h{VWHtcwD`ZgI)iiSV8({2eLHm?xSGBAvr@gL?0sLUdEdzuJ
zNruUnuv@Z(r@=V(N3$JrXu00&Z^rC@kqaYAGmf0eLMo&|J@+vlpPe?ueI1gYaL|n~
zZ2=~&lr}55du6(d#nRPRSv|{W@$iB7`f$34JzVv5jKz)siLOe8h2xss`{v??Pj85f
zQ1H?@s(jY+Ptzh6DC!)n5*AQwRk!NeT=(F*TONgDq(VZ(AeJ#Q2#H0ts^dVf+t9@<
zLNdQKj<A24H}z4_#+|v%z^F#r;|`&}v(#O;Y8Ww*cIO_Y`*lD1+-}{>iGzleH#J~?
zeBz0AXA_$TLSl7qQIQPkDL2TyCrj82+d>$sv)=~RzgSr0xnucg2q`(xi+>$0kT8f4
zXRjsc@5+|+P-XB;{IpIwTnW)+bY64V_B9uBe3r7Kvw^yHrn~gyg$SNq@r%_}QDv}w
z9Q0Q|HBR{wF+o2-i8ECthAN3iPQU{v&uaHT<oYc&p}PaOh*;nW<oPR4?dgcKxCt^U
zRM}<bC^0zsLxeWGet7Ogr(T*21$%pTTV1LJ>EGa0vP#oo5AX0NG8;T^SI8`3n12-J
zkjlu@^y14JC0d}cNCsifc;I{c1$pQ$_n4_CI-l!3u|s_>uDUD&MR&Z~U$|W#@mTcj
z;(0xa=^9y|TWV?UJc`%w+}2|WTzJ~2UfpBw2_v_!#F4Ir=dE1)O5?g<RuI>sl{+&U
zL?LFT@Sj5Mzd`jGYzG&XqbE6L6;s};t<xq%b9WHVM$IO_Zn!&3IU75xn3PFYc^{4Q
zvf);#BU{nqBSmtJ*iqIKnHYJti|+T{G|=)G|7R+v9ll9M6g!;cW@J0`<ln<i$dghO
z{PE&UajGBWak0%hvE3~K97&s4eUWlwn(u$yC?gCCZRJdQNj(rfA05rETV=|TUfhJR
z6{Z-T!o4uHmd_^JVNRgbb$!o5H0*ukE(lEikU~Np_JidMSU2gHPN^{m<A<f59zG~5
zw?bJKTl&W}w)Bc#YtF=1ovj}vdOE}50u;(@u3#qhZ1smaOFGB8U&^I(TXI@nFYSM0
z<{)0FG<BI_yV0+5qIILh>~(O$)c2)N%|E0!DFc6|Hy#W-CYv<qZA%xFng{TonRpT5
zG}bV=+CF?|V45#%LC>dfmv8RpXcpol<K$k@N><Ng*GuOrTg*CxS<68apZF!RWV6V-
zeU>!vv!n3Ow~_~Z9jl+NpHBouT{O`ZyX0UBkAsc4!&UCQqe*sZ^*yPqd4`9iR2fLM
z)a6U<PdB~0;5d+K3gRqWlAWBrOM0wQsrk6Q&^r%ZkFH70kJD#%lvDkXZBNLm+=ITR
zgfADO3pR5to^}t>)1L;=vPV7Sxn)~cx#$SBjFJuRIPSafy_8eL=O8=v+}|*J?b>h(
zyyhJ3+p>L8)*J!Ic>Hd`8F`<Z7qC>`#jO{eX_H^2X^Pvyp{Kjh(MN~k5b?h}$6xbA
zx~tvY^eJr;uQfGDce8fe9vprj+VI?T{jNGCU{`35@iwv{K>L@kV%3{!{Wn6pwL-kF
zSdrwERHi4<j*Ef8Os}av;!c8$wo%VVpZVNL8C{R?%p0Joeo*ytV9_IjHEL*i8%V16
zO43&1yJS|BO@SLKS_;>o5Wz}IB8g~+QF+#3v>#DnHf$Ib%vut)*1|rV+Krxi?Gs2B
zZxawAYi8Q?9!Txz^AwC{^mjXczV~oJj3MxLCt1x`0|O<n%iEXhJuY^d?o}|Sjh)*^
zCpk;pwByZ~2G5<bi~~OMps(vBGiKHpDZxgqd?7nWRZk<sX=(q%?Y@Lquk)oa<|B;D
zDZ5dPMAbz4XssOCUf`xcv^TRaZ2G58^oGIaon&VnB!@gCL(YeOk|;SNWVn}Z@0oZD
zS~RgpBnlkmQ5WeUFrKl(@Y5^|SC}sNoxoGJjB8P>lDfK>zEFXP2*;l@KaDZ{Q_kQq
zj75`&8XdtMN(@nNB5~I(j*cx9At8n={4iI{PU$C<^H*d#e~z6fKfo;E4UjSBt5)H3
zZz{UqVMo98O{X+*Ttw4N8d@Q>3(d=uSIrsgXC7}S&KEunXA2iDG?+L#z?e_R(qYK*
zZpk62W@}SgQ((@<!CanKdhw(FyH1Q{I-Y!rFy_S;J%-Y*zRKI)+!OWB22y&fD)Pjt
zRx%7vqP>qnAB?unLkzX^g`&I#q#Qr(c^bP+*>FexqPdHVc@+IIITRj}0$2aEQ*03+
z^YZqWB04oalz84(9R3;Z%?Lm}$yvqoTZGgB0V$3>r#~}<BOcn+mE1mk8~6rUGiqn8
zN$KraaGCVUa{uxuf$_7+Taw{%V&bRW7Q4bOLw;Kx6H-;htvM6c70-xb-nCFKdh(B;
z$j51Uz7$HN$)W8v3dyr?TWQ6*ncCQB5%9ID<XG3wt9BPAuW@Ej!2Aj)HG{gxD5@k~
zcoOC#NEn-uz{vHAj~rBQ?Z1zX9xT~DB%(|$oqe}pr_VC^^=8_-;d3q?8zY*Dday|?
z|JOdJJ_3(lPo>VLI{6q`PC7RamQo#R9WkE6GMfEUyAdJ60`ZJh4nlhn;`m_~re}e3
znrb$yvqe*w#iJW$qt$buNC)W22vzhze4<|X(dv5<+=RV{M=D?A`SOaZ^y*6B%@k(E
zjav7iY2Q@zIc@K>>Bl-#ClM;r#@<URctA)WyYqF{=;OTH&PPjaRbGGAW^M2ML_5IS
zh%&h+UNih<jCb?g3{39Q+V-~TS34t;2n}ef@6lA7x9dCABIiRl^5RE%I2X>oOx=i!
zJR|#-@lIWUJIn0EXPN@}K8t=0ZX)~O{(UviSlFI5m!LIY-)Gr~RG!g1^S7ZvL5i(G
z<<s9&YpHjWLtkob(^50(Z#(0AX<f_IzQu6%2@q)HqhFWjx<qwW75bg`M;a>_tvy7=
zGy2Nhv{i)aOlZN3YPTj-gRh)_{&grR-+TSmG?f%N0CiSt$Hjq-<$Evc%}nG6ZYqi5
zX<7Uz>Yq8&*YUZ)tbpVez3m3T1tUKHAm@#${uhKEJPp)e6ijfm7FjJC3)3$jEORbo
z$!)^wB<(>nGpLc4Ou%849P_j~-w_YBXxBP5-x`%%Dp7<C@G?0%y-{89h1RY3!<;q&
zQtuRB4@K6X_GGu@!q|FJo6jrvXbNR!l*+gZXTeManqvDAxO*+(v?zorYuIP41w;fP
zcOz08ZXueI{u=j)8h-%7EyCkR#m1?c!eAqum!);9S1VYZGn{Vpm<Z29u`YLe7`;1-
z>{Y@4@m%fMk`F$mECD~|XG|U+LrSPe*Azr6OpCaznE3m1NHw9#Sw@Cyl2i7>CG?_a
z0m19Mwja5<;<gdnUNM<dEr}nWX!$;Ft6wvla9Lk9`kGeCb{IrrmG(GuXu?ZKpYSZ#
zJ(<6e&=x-N-GXu}%7kgZPH=tpbVX#xAl|~a<42X$VNUINOqldx^OLgB=@1EfWlW2!
ziAIyZcjf6y&1RN)#iWB&^QdcSgSgjRWJ%my><?1rw&%v-2RLc(=oOO}%G7g;s`YK}
z&3$*O53BB%DWF3)n~vH}zn;IKKcJ^?y14PB_1dEnTDeA&HPuilVQUJ*xXw39mO}NW
zo)(h`x2BEy*;z-kSD8_<n?+-Ta&;!7vu%5KRom`L%w%}>)x-6x;w|M&$CVZ^s^W{x
zc%pbwcpo@FA)@q_65FbHmBC_dD?WPUtPk>tq*{_z%_dap#$+E~8q<DF^)u7|KEa%-
zt&h(<5_WnxH=;1BS6F(fzSp6R7l0?}*f0AeZctK^`L(!%cc%>WhQF$piZYRyf1LD3
zO38$TWZPRq6r~S{S-IU+)Y;%Y*%nI(ZjH*|lpoUtV--&0Ouj=g+*$DHICxREZI*vW
z3_btELz=1x%wmOUMO2-FPDB7<3>U@qmsEl8zGx0Dwq7@pV|6S*@|GgrqsZKr0uR=_
zf-d$BgAO#x7m!TI38v!8F$cCxqnjd&(`Keda<MI^8@88gQ+Wdkdin`cEEDH#FUH3u
zK^!MsaKC$zHiVxQe3sEUluj@Pb$U}lSAF7IqWRa?7&~b4KRU5GJ<Wcq^VEpug(c&i
z@<)>x<9BxW4{|)Mx@M=DX>Jxb&3vdP;UW4&9|frHAGj{Vgn>6Mupac*RNKnjqm;`~
zr+i7-FJ#c+`c!y_>pFpJb$8JNP4Ab8nS+Lk8X!3)wi(5+M7h~tDs9;hsu_E{+qZbe
zmiZPwg*-aR^ImjYUzBdl1ZdZeZ}kc*nG9Z@;r4n^pZMmOqduzQ`;44m(n@QcY9x`F
zl{*Z}hQ@(qcWoc^=Zk7AZHM0uGdRI$2Es~d^<^p|jmvs%bOj#HIWXw?Gz($g*0-D>
zg_oTAg&9ynO&MP*s;erB6RBv#@L5ZXp)h(gn0qogV>|{o#FOBp(D$1#V&t3UOO_M6
z(Rb#%xhdhbH@#R?RD;;g^7w-Eq#|K}aitA+TT3-Gm*MN10>@E#WuLr`J)KQnE}E>3
zP7KoWJJkm*ovRfhvUOTtfxaE9pgfO$G&~5CB>jc=pt39w^R~l|0(yB;_;dDP^Re2C
z#<RA1=J=3SE>WTV>;QwYnO9ZBoX6Vtr>_};qRU9VNhx!NrO3(RAm3J0$GDRFTgTas
zq4H}Uon(N*dj=Hb92y_Ol5EH29q<QAqwpliWo#r%Y$s7;DQtr1$@V2WBdI$d*Cp>z
ze$%!09YypA(m^+TLPd$T0x_^rpO66OQIeD82F^QVqYOD_sNukPPp57~lBErOn<k^p
z!6yE*zWOYgs%3zZh_!zCn=YP-wU<7>4k|%bER6vcTeLO(Ejo3FjHf*}*~9@m`?*#>
zOd6#gdWk<MIu$j0x?!R#^j+^EqG$8+cqo@pBRq~iFJ`~Uv#a~&PcL(PN!sN;fXvI(
zlJemcU6br5%c|ovDLWZSkK!sAz!T(479#VG<m+(@PjEhD1hdaR3+8NpK=jOJO*z(Z
zq=QAatI_*D2b*6^#K>b_QHy{V_j^2^-GN!bv&)$4L%x9e`Y+B2??`rMr#P{0lYBOG
zsW;vXyk^l;RP(lBF*l>!{4)3B)aq{A;UU$a&N6FOf{wVK+Vx}oq0=$KJg?XaE)n(?
z3rsxG&;qX8cX?TVqdf}u+3FBzlitWvJ5grc4yWfQ^=pT<a-Xb?c}2RzAYQtG`ps-p
ziN^%=M!_Ta3NI#ScOBz$g+F^fKRc?Ao3hDc8ZPwTTtG~OOW+G5Z-t#WL>Fh<*sY?9
z<ch4B(i1+1lYa|5_Fkr@*Ljx@u}v2Q%`rj(bvj2#*y|A2J0x|d>7QE}R#zrz{-|2#
z-_3;hD0MpfaHnCq!nFfAP*krhIuLy)Mvy>ae-2w~W8iS`TyK_MqM$6~>Abt>9gUvq
zDn7HP<vn7uPjRx-kJmAnpEM+*_;8_D*^T|r*NDVRdANIHUd2^3OEVW0tqH0iNs-Bv
zE(X+u)Kc}gPSSs*S>w(%uayfrd&X7FSsR3F*~waee)#ned3$BsQ+;Y^wB}?0)HLrb
zJqXAgH7wVB#_#7&^fK@yU-5$Odv(q0nbz{HH-f8^J{{(0Bm+`vVt-7n==+*#<C`=Y
zwObX^%R?z4mTIw#7VK?nUU`zs<Y>T-Cx)^qCNSLlaZ@PV+Mm%=&KEi&616OpXjIJ#
zbqsH$$F~~w?tIO#6hCf&Q^qK2wR^`RwAeNBgCATj1Dq})?K->d+Ay;qUU|dZ&vinS
zr*oyw^@fPZ)cz91_HlRN)O7o@Bpf&PI-6Jw5gk2Vy9aK%|1!}loeb5~bq%iKK0gw6
zf4I)>W6|5ZLOQ$i(Wbn6*M{bLd(plMk8vm~r)DdU`J_(TFNa)8PVq!3T5!!Iniu)K
z0zVs{#OsAqD+Y0J-KSVCgwuvCUr@994}f0L&$EwoT;8bjwkvr*$D{gihMw&m(NxJ>
zMd#_`=>}>$=ewjH*W#ufxu=x&W%ya6&&O9=jke3Xaksa)YM-B$E!K|PZ*1w1tl~`&
z`ew>PB#=iv1vlyKtiC8;FA7PxIOt`x;CP~i+Bu+>X6Ki(N{r*M2-O}`pjb>~W>#sF
z=<*jPaMTp@<t1=TA}GEO$Cr$|%VEJ>H9gKzs=RX4%z?yX@hm$djfONLrHSL`TsUUX
z1!RPAPkdgpLp8*b!AcbAN#O)4OMJ=TsBdl|9KB(^tsJGYbw9f~N)?ZP)^TKoI=iMP
zSCCNexo}%ZeqNAPX;ae8AL5+R{S|C87RYdtwuq)sS59zXab|i6mk<?`ph$mwQ>EbX
z?yf^IJB%kH&n;m@45rEDG~S?Zd0pp=HIfhJ1BN}~a<X^2<%wK%n5cQkke!^T?GF*7
z`$3!ilRcjF?YAjNy*P|MKH*8i{p`x_q1-2<+aXOu-D*0xm6ffd1@mc}Y42&LZf9oY
zb&Xf;u2y{(|LGTT8OJ_-zP+p~0VC)b5-e^gtyTpn&sA2wr($MIt=FTfB_@t1>7a81
z!sru1x4r%Gj03hm%rB2jFXJ#fl^{7oJ9oNcb_yQsjJ7^Qn?Y|UsKqD5cg#_)1vJY?
zk)$c6wBZ7cVBqF~!y@mUc1o-xBg@-#3Z^iMsah{WI24BegvFdaRK&~nt&cwum#vFj
zC%f85OA29W{DUaVu<7xR`J=GP5bv?0`HHQ<<ri9JZIjER6<bf}9XLh%TQnGj^V}YV
zMGbK<D7M?-eM|~}JcP48OHm@TuwBlOLqa7VwoR1FbI%*cLD35M@CMoWOFF+9pHFR6
z?Uvhdt$V=X!ek?vH`nl6$GJxEw_zCS*ZHbafGPMrWm#C{K`V+vors{3@g!x=<=XiK
zlIb%&{;}Y+C*(8FvUZ;Z8b_jlMx^x-t_;0ZzG`Se`tg2|)0yan=MA;DuHQn<pe~5l
zyC{##tc4&mC5k#08@<_HPdWG0vCSJX>Ri+|8Bkg`*f?Fv>PZ%PZELiAj)stzvU~8@
z6WkXS5+vLAAa6+JI=P?U3{!Oxt>L9RCS3~tHqD_sb0leyH_2>mHTh}TO;0CPq^*Jg
zb6cI6C5!Qw8GTo2jYJ~Gs52)3cpOwh8$}Ii-KDeIlOU>!5d~Sn4rK$J?%UYKeU<DR
z3~8`bonK7&YAEE#rPn|C&~v%>3-?!(gFwEOOEO08q;~}G6XYkY?)*T+iS=4CMTj!t
zFFRi@#}RYeANp3W_pEwfm_6y^6ldp-I}-h#CAAx%dimINV3QWivivdKWiGb163xg`
z7tvn3{p(XTOUjf9$StcWa7Jv*^X=vMn4|HrFtR?<!%p_mEsz2Y7ft^iJK|Rfu6*^6
z`&#OZ=Z*$1We>~Gw!HF5T}_U{R!B!k;p1MLM>4j^3mnwM777*x2KA*6X!L3fm}Rs`
z1O=FioS%<vrL<hU7_c~bG3VE@vs$B{(D+%gIYMp9-9I*5Ls30xY<Lts?l$g~;Wu*(
z`Lri+{KQs+M)dB>#=vCFy@%Yxy?y7G<SfUlG3CiI+^=3f3kb~&^gnQOKbVdPv*t6N
zrDH*fcN(fN=Seq+e;n{|tm8aTPJ1;`HoJH)=)(}HoVZu2xF;qR4mqcvU~qkUQ<idR
zdbQ5!C)_Kv;X~oFSljUv&m&V3Gg8W7*eBQ&?4aQhrjH;Jrh$Ah+4~Nb4wn-UCeew_
z|M=a#a-sdHqrmtD%^912#sJLBZt;2_XY-;As<~QJ#Cogd`0YgK)QB2*wKH&JLrCCx
zboYphnB}bMcIUlUPLIL{=EmyE)N30y{6A|eXO<9d>F(&1yh)kF-4NH^(BWI1tgN;r
znJfP#6?g`B=yKHI7xNprXX=tEc1tGs`Y_Hd9~5k4P+XYWYnagV8jb{x*Sr)?fr$<Q
zn>(mF$q%5RmRrob{z~G;b$qot-sjq{NpAF+=tNKQeD5pZfeNQJtp(viYvbSjFIB~>
zdf`<mQA7|b`e#{D<UeIaT_0BjNXf++t$;vTx!b#<U9eSE>{8vr2?3Imy?Xdn?JW`R
z7HE4HXB~vQy$#^1>}rbwLa`Gpr<|ONw~>IL2n;A71Qr4cg2BQ-QMjN9=swy4X>TR#
zY>Pwy!2pmf$_n9(2Es)J0iY{mR|^4%APfMKw{X3Ou(!2CU&#SLI%tHG9uSTdxl)g<
z^dca@t3s$Y09)4lcV!g*pAh~i3`0ak|DUq3Nm92%JD4nT%NM{rEMKv{ZcbE8yPZqu
zaf<T<s*eBej`hNHZMjlP&0tuc$Yn3c=Kkjzhxmi;H<{KqUyzRT+}uN>D30*U#w(z6
zDi4AZX3d^7A?|N`_N-eV`@jpL4<_ZD51eP-RA=1X{*X*t^uZpr@Ft;((9Ns*fKUni
zf>4jjxRq?uXLSQ5Ek|LprWb)Z=n;E#0hpvEl!$dxdE0fr73oJ%CZca%M}|L;`O4gU
zq{Y}5*n>!X*+f`q&qHllD{$R5=}>u|c!$J?QIxVv{EN<fz`Xpg+xMn`EHV7^ly33<
zT+WFsF&bT*O_WX4EA;MazU#TH0W5Ip4o=Aa%dc*ur@C<1<brLs@nja^o48N0;vF0I
zxGjh8QWW*iny<Ntr*Qu-I1>F&zW;;_NXNqxeT5%gcMrsGs+<K1akXjxH*)OVQD}KP
z3->ETs9O9n7Zd@2^zE(Db|@num@p6~2nGs+!9XZf2nZ4WV-ykjy%xcaSKqE)2zD+6
z7yWZBBqRj5qFu?D{0lw*K{fCS^x6QBuFFGb`>Tcl;1z`ahAFJsKf4W-1c6r}|NXn*
zU%q3b#A5w73rN%5#YzW(HUeQA7(luRZ?wr@q52o8-$~N6utk70E!?jT0Q5=$NE?B2
z@o=|7ps>~Z-vl*;wY|mFxw<kSEGi6yLm?(0Wp@`3S8OMQ4mRNy&M4O_6;?hVc^&L|
z^0c=?Xe-Ns?gP=-&5)7;$zvVFT0jA>S}3&ta&oRrUfl>-MSr@30{p`V0O(IAumXR2
zah2Ey_SPsP;BQZ_mhvthSGo9$3BkX#ZTz+&Z-KoFTx_vX+hT+K9W(%>;fipUwYs`i
zjQ*ty^vJ*v=<I<+{_6*f)vapbY|CTgE}*2%`?r+-yIBGoggmzC1AA*pC@Cr_VecLh
zFjxcv2E#<LBNRJgfg%Et0$lBpwTBhr-+WN{fAPSuyubOed{C@B4ED#1m4^voUo0KV
z0v5U&6|tirR@ZNnSicpp-6uQ>Vi2&P2v`&>EQtMsfce1?ZZMde_b>VIc1PF%z(7GL
z0ITVb2M7}u77_;90RN!Dp<paRuO6WDziD8wAQpuGMS}=q^Y?ceTo{Y^|Du5*BLCnM
z5e8#H|94ptVaPvhh=@S`AqxkKVt4iLvTz~DKkUMVg#XD0gZ{$?Tm*{!-}G;NXm<<j
zJ@0-6N*#M&1U6M5Z5J0Ts(zyv0J`sN;{p`?-TQ-GC;*Ls5^{=gMNy~{TuBh30GE}6
zLIh=n6`=A8ii(P&vPxi4DZu~Fas^)n7b|%?gq0)8!wCoyQiMXG@=8#75d~3Mm>?7m
n7m=5fRe%W#$tlXq2`XNJ5QVmINB`bZxF|#rz{#nop#=CJ_>!n@

diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/calendar.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/calendar.eml
deleted file mode 100644
index 2ae45338c04..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/calendar.eml
+++ /dev/null
@@ -1,42 +0,0 @@
-Return-Path: <local@localhost.com>
-MIME-Version: 1.0
-Delivered-To: to@localhost.com
-From: User From <fromUser@localhost.com>
-Message-ID: <2d0fa16c-4c37-58de-1acc-50b5f6a23a60@localhost.com>
-To: User To <toUser@linagora.com>
-Date: Wed, 26 Jul 2017 10:34:02 +0200
-Subject: Any subject
-Content-class: urn:content-classes:calendarmessage
-Content-Type: text/calendar; method=REPLY; charset=UTF-8
-Content-transfer-encoding: 8BIT
-
-BEGIN:VCALENDAR
-PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-CREATED:20170726T081145Z
-LAST-MODIFIED:20170726T083402Z
-DTSTAMP:20170726T083402Z
-UID:f1514f44bf39311568d6407249cb76c48103fcd1fb398c3c501cb72b2d293f36e04
- b2aab16e43439a608f28671ab7c10e754cbc85ddee4a07fa8cf8f4f7af05bfb502b8f6
-
-SUMMARY:[A CONFIRMER] Call OVH
-PRIORITY:5
-ORGANIZER;CN=User;X-OBM-ID=id:mailto:userTo@localhost.com
-ATTENDEE;CN=User;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL;X-OBM-ID=810:
- mailto:user1To@linagora.com
-DTSTART:20170727T130000Z
-DURATION:PT1H
-TRANSP:OPAQUE
-SEQUENCE:2
-X-LIC-ERROR;X-LIC-ERRORTYPE=VALUE-PARSE-ERROR:No value for X property. Rem
- oving entire property:
-CLASS:PUBLIC
-X-OBM-DOMAIN:linagora.com
-X-OBM-DOMAIN-UUID:uuid_value
-LOCATION:01.78.14.42.61 / 1586
-X-OBM-ALERT;X-OBM-ID=486:600
-END:VEVENT
-END:VCALENDAR
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/embeddedMultipartWithInlineTextAttachment.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/embeddedMultipartWithInlineTextAttachment.eml
deleted file mode 100644
index 7e572cdcecb..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/embeddedMultipartWithInlineTextAttachment.eml
+++ /dev/null
@@ -1,42 +0,0 @@
-Date: Tue, 03 Jan 2017 16:05:01 +0100
-From: sender <sender@james.org>
-MIME-Version: 1.0
-To: David DOLCIMASCOLO <david.ddo@linagora.com>
-Subject: Re: [Internet] Rendez-vous
-References: <9b6a4271-69fb-217a-5c14-c68c68375d96@linagora.com>
-In-Reply-To: <d5c6f1d6-96e7-8172-9fe6-41fa6c9bd6ec@linagora.com>
-X-Gie-Attachments: none
-Cc: 
-Content-type: multipart/mixed; boundary="----------=_1483455916-7086-3"
-
-This is a multi-part message in MIME format...
-
-------------=_1483455916-7086-3
-Content-Type: multipart/alternative; boundary="------------060506070600060108040700"
-
-This is a multi-part message in MIME format.
---------------060506070600060108040700
-Content-Type: text/plain; charset=ISO-8859-1; format=flowed
-Content-Transfer-Encoding: 8bit
-
-/blabla/
-*bloblo*
-
---------------060506070600060108040700
-Content-Type: text/html; charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-
-<i>blabla</i>
-<b>bloblo</b>
-
---------------060506070600060108040700--
-
-------------=_1483455916-7086-3
-Content-ID: <14672787885774e5c4d4cee471352039@linagora.com>
-Content-Type: text/plain; charset="iso-8859-1"; name="avertissement.txt"
-Content-Disposition: inline; filename="avertissement.txt"
-Content-Transfer-Encoding: binary
-
-inline attachment
-
-------------=_1483455916-7086-3--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlAndTextMultipartWithOneAttachment.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlAndTextMultipartWithOneAttachment.eml
deleted file mode 100644
index a5ddc8bfc31..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlAndTextMultipartWithOneAttachment.eml
+++ /dev/null
@@ -1,64 +0,0 @@
-Return-Path: <user0@open-paas.org>
-MIME-Version: 1.0
-Delivered-To: user0@open-paas.org
-Received: from 172.18.0.1 (EHLO [172.18.0.1]) ([172.18.0.1])
-          by open-paas.org (JAMES SMTP Server ) with ESMTP ID -674616268
-          for <user0@open-paas.org>;
-          Tue, 07 Jun 2016 14:23:37 +0000 (UTC)
-To: user0@open-paas.org
-From: user0 <user0@open-paas.org>
-Subject: BOTH
-Message-ID: <1cc7f114-dbc4-42c2-99bd-f1100db6d0c1@open-paas.org>
-Date: Tue, 7 Jun 2016 16:23:37 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
- Thunderbird/45.1.1
-Content-Type: multipart/mixed;
- boundary="------------7AF1D14DE1DFA16229726B54"
-
-This is a multi-part message in MIME format.
---------------7AF1D14DE1DFA16229726B54
-Content-Type: multipart/alternative;
- boundary="------------172F9470CFA3BF3417835D92"
-
-
---------------172F9470CFA3BF3417835D92
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 7bit
-
-/blabla/
-*bloblo*
-
---------------172F9470CFA3BF3417835D92
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 7bit
-
-<i>blabla</i>
-<b>bloblo</b>
-
---------------172F9470CFA3BF3417835D92--
-
---------------7AF1D14DE1DFA16229726B54
-Content-Type: image/jpeg;
- name="4037_014.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_014.jpg"
-
-/9j/4X2cRXhpZgAASUkqAAgAAAANAA8BAgAKAAAAqgAAABABAgAJAAAAtAAAABIBAwABAAAA
-AQAAABoBBQABAAAAvgAAABsBBQABAAAAxgAAACgBAwABAAAAAgAAADEBAgAKAAAAzgAAADIB
-AgAUAAAA2AAAABMCAwABAAAAAgAAAGmHBAABAAAAfAIAAKXEBwDQAAAA7AAAANLGBwBAAAAA
-vAEAANPGBwCAAAAA/AEAAEwqAABQYW5hc29uaWMARE1DLUZaNDUAALQAAAABAAAAtAAAAAEA
-AABWZXIuMS4wICAAMjAxNDowMjoyNSAxMDozMjowOQBQcmludElNADAyNTAAAA4AAQAWABYA
-AgAAAAAAAwBkAAAABwAAAAAACAAAAAAACQAAAAAACgAAAAAACwCsAAAADAAAAAAADQAAAAAA
-DgDEAAAAAAEFAAAAAQEBAAAAEAGAAAAACREAABAnAAALDwAAECcAAJcFAAAQJwAAsAgAABAn
-AAABHAAAECcAAF4CAAAQJwAAiwAAABAnAADLAwAAECcAAOUbAAAQJwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
---------------7AF1D14DE1DFA16229726B54--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlBodyWithManyEmptyTags.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlBodyWithManyEmptyTags.eml
deleted file mode 100644
index 70739a4f5ca..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlBodyWithManyEmptyTags.eml
+++ /dev/null
@@ -1,105 +0,0 @@
-From: User1 <user1@apache.org>
-Content-Type: multipart/alternative;
-	boundary="Apple-Mail=_D2911C08-3A5E-42E0-8425-66C5B77B4CFB"
-Message-Id: <AB19EFD0-02FC-4141-AB01-00E5DE4ECAC7@apache.org>
-Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
-X-Smtp-Server: 0977CE5E-80CD-4915-A107-FAFEC09C4749
-Subject: Re: Subject
-Date: Thu, 2 Mar 2017 17:45:51 +0100
-X-Universally-Unique-Identifier: A41C9129-282B-42B3-ABE2-4FA16E75C536
-References: <5982F566-52E5-45B5-80A0-D52FB38EEB2C@apache.org> <f0899677-7238-b9e6-8a15-7bad5abb8fd6@apache.org> <6F0808B0-742B-4480-AD6F-E85C093E94FB@apache.org> <30371dd1-d178-d1e3-af42-6a87b48c7c70@apache.org> <CA8C086E-13CD-40C0-B653-664436B07B3C@apache.org> <7424b885-8168-9369-d718-b3efb73bfdae@apache.org>
-To: User2 <user2@apache.org>
-In-Reply-To: <7424b885-8168-9369-d718-b3efb73bfdae@apache.org>
-
-
---Apple-Mail=_D2911C08-3A5E-42E0-8425-66C5B77B4CFB
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain;
-	charset=windows-1252
-
-
---
-Signature
-
-
-
-> On 02 Mar 2017, at 17:36, User2 =
-<user2@apache.org> wrote:
->=20
-> Hi,=20
-> Test.
->=20
-
-
---Apple-Mail=_D2911C08-3A5E-42E0-8425-66C5B77B4CFB
-Content-Type: multipart/mixed;
-	boundary="Apple-Mail=_B0F07404-D743-4428-AC87-850B66EAB0FF"
-
-
---Apple-Mail=_B0F07404-D743-4428-AC87-850B66EAB0FF
-Content-Transfer-Encoding: 7bit
-Content-Type: text/html;
-	charset=windows-1252
-
-<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""></body></html>
---Apple-Mail=_B0F07404-D743-4428-AC87-850B66EAB0FF
-Content-Disposition: attachment;
-	filename*0="ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKL";
-	filename*1="MNOPQRSTUVW.rtf"
-Content-Type: text/rtf;
-	name="ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZA"
-Content-Transfer-Encoding: quoted-printable
-
-{=
-\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1036{\fonttbl{\f0\fswiss\fc=
-harset0 Arial;}{\f1\froman\fcharset0 Times New Roman;}}=0D
-{\colortbl =
-;\red255\green0\blue255;\red255\green0\blue0;\red155\green0\blue211;\red25=
-5\green255\blue0;\red192\green192\blue192;\red0\green255\blue255;\red0\gre=
-en176\blue80;}=0D
-}=0D
-=00=
-
---Apple-Mail=_B0F07404-D743-4428-AC87-850B66EAB0FF
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/html;
-	charset=windows-1252
-
-<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
-charset=3Dwindows-1252"></head><body style=3D"word-wrap: break-word; =
--webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
-class=3D""><br class=3D""><div class=3D"">
-<div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; orphans: =
-auto; text-align: start; text-indent: 0px; text-transform: none; =
-white-space: normal; widows: auto; word-spacing: 0px; =
--webkit-text-stroke-width: 0px; word-wrap: break-word; =
--webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
-class=3D""><div class=3D"">--</div><div class=3D"">User1 =
-User1</div><div class=3D"">Signature</div><div =
-class=3D"">Signature</div><div class=3D""><br class=3D""></div></div><br=
- class=3D"Apple-interchange-newline"><br =
-class=3D"Apple-interchange-newline">
-
-</div>
-<br class=3D""><div style=3D""><blockquote type=3D"cite" class=3D""><div =
-class=3D"">On 02 Mar 2017, at 17:36, User2 &lt;<a =
-href=3D"mailto:user2@apache.org" =
-class=3D"">user2@apache.org</a>&gt; wrote:</div><br =
-class=3D"Apple-interchange-newline"><div class=3D"">
- =20
-    <meta content=3D"text/html; charset=3Dwindows-1252" =
-http-equiv=3D"Content-Type" class=3D"">
- =20
-  <div bgcolor=3D"#FFFFFF" text=3D"#000066" class=3D""><p =
-class=3D"">Hi, <br class=3D"">
-    </p><p class=3D"">Test.</p>
-<p class=3D"">Test<br =
-class=3D"">
-    </p>
-  </div>
-
-</div></blockquote></div><br class=3D""></body></html>=
-
---Apple-Mail=_B0F07404-D743-4428-AC87-850B66EAB0FF--
-
---Apple-Mail=_D2911C08-3A5E-42E0-8425-66C5B77B4CFB--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlWithLongAndComplicatedContent.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlWithLongAndComplicatedContent.eml
deleted file mode 100644
index baece29890f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/htmlWithLongAndComplicatedContent.eml
+++ /dev/null
@@ -1,1995 +0,0 @@
-Return-Path: <bounce-md_9656357.58dbec18.v1-49d8af7b35d9488c9dead4cc3cc198b0@mandrillapp.com>
-Received: from obm3-ui.linagora.dc1 (arathi.linagora.dc1 [172.16.18.50])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Wed, 29 Mar 2017 19:17:15 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from localhost (obm3-ui.linagora.dc1 [127.0.0.1])
-	by obm3-ui.linagora.dc1 (Postfix) with ESMTP id 577115A5F2;
-	Wed, 29 Mar 2017 19:17:15 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at linagora.com
-X-Spam-Flag: NO
-X-Spam-Score: 0
-X-Spam-Level:
-X-Spam-Status: No, score=x tagged_above=-99 required=2 WHITELISTED tests=[]
-	autolearn=unavailable
-Received: from obm3-ui.linagora.dc1 ([127.0.0.1])
-	by localhost (arathi.linagora.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id 4bzZP7QfPmJE; Wed, 29 Mar 2017 19:17:15 +0200 (CEST)
-Received: from mail136-224.atl41.mandrillapp.com (mail136-224.atl41.mandrillapp.com [198.2.136.224])
-	by obm3-ui.linagora.dc1 (Postfix) with ESMTP id 8584158403
-	for <vietnam@linagora.com>; Wed, 29 Mar 2017 19:17:14 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; s=mandrill; d=mail136-224.atl41.mandrillapp.com;
- h=From:Sender:Subject:To:Message-Id:Date:MIME-Version:Content-Type; i=communication@mail136-224.atl41.mandrillapp.com;
- bh=yJhIEmCfgDbo8xdU9+tDNkfptMw=;
- b=fzGGO+DuKddeSBCRPAw/7FYZ/705poaWScEOFMYDPk0lK0xivc3RpPFf+KqnICqfh/l7tSQuixzG
-   rYdpBv3panK7BO/kCtnr4Cchy9G4x6PRaIaa5Yn+4ATbNF+G5ZMEo4VQ6b2eYRpun9GNKf4KH/Xa
-   JLvjpo6zlG26d18VPDE=
-Received: from pmta04.mandrill.prod.atl01.rsglab.com (127.0.0.1) by mail136-224.atl41.mandrillapp.com id hrfm1k1sb1k5 for <vietnam@linagora.com>; Wed, 29 Mar 2017 17:17:12 +0000 (envelope-from <bounce-md_9656357.58dbec18.v1-49d8af7b35d9488c9dead4cc3cc198b0@mandrillapp.com>)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com;
- i=@mandrillapp.com; q=dns/txt; s=mandrill; t=1490807832; h=From :
- Sender : Subject : To : Message-Id : Date : MIME-Version : Content-Type
- : From : Subject : Date : X-Mandrill-User : List-Unsubscribe;
- bh=ewlRqmSXhXnjGp1bY43oska+6G6I3EvUCfH5hCQaH4A=;
- b=UPFJiVExUycrvG/DF1YjJFTbTw/S1k2JofcEVY9AmJC8JurPBsWkiP2zljPgaDRI7ufo0r
- tahqpPJYX/sRtkYmRXSlPDKMeRCI67tBiB3XnHuUE5p9Y6+jdRoRZ+aRdskohp8jZ8gCT/pM
- LVTBwMMJSf39TNWmWRMkM2Gx9SA8c=
-From: <communication@linagora.com>
-Sender: <communication@mail136-224.atl41.mandrillapp.com>
-Subject: MailChimp Template Test - "Formation sur les technologies Open Source avec Pa"
-X-Accounttype: ff
-X-Auto-Response-Suppress: OOF, AutoReply
-Auto-Submitted: auto-generated
-To: <vietnam@linagora.com>
-X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com
-X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=9656357.49d8af7b35d9488c9dead4cc3cc198b0
-X-Mandrill-User: md_9656357
-Message-Id: <9656357.20170329171712.58dbec18aa5717.87868045@mail136-224.atl41.mandrillapp.com>
-Date: Wed, 29 Mar 2017 17:17:12 +0000
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="_av-17eAoYMNNKEIcqCToyLXBA"
-
---_av-17eAoYMNNKEIcqCToyLXBA
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-
-        *|MC:SUBJECT|* <https://www.linagora.fr/>         Afficher l'email
-dans le navigateur. <*|ARCHIVE|*>
-
- *Hackathon sur les technologies Open Source avec Passerelles Num=C3=A9riqu=
-es
-=C3=A0 Danang <https://www.passerellesnumeriques.org/fr/nos-actions/vietnam=
-/>*
-                                            *LINAGORA* *est* fi=C3=A8re d'=
-=C3=AAtre
-partenaire de Passerelles Num=C3=A9riques *pour *anim*er* *un* *Hackathon* =
-avec
-des *jeunes* =C3=A9tudiants dynamiques et prometteurs.*
-
-
- Du lundi 20 mars au 31 mars, l'=C3=A9quipe *LINAGORA Vietnam*, et en
-particulier notre expert *OpenPaaS* <http://open-paas.org/> Beno=C3=AEt
-Tellier, effectue un *Hackathon* sur les technologies *Open Source* et
-l'environnement Linux avec une vingtaine d'=C3=A9tudiants vietnamiens =C3=
-=A9voluant
-au sein de l'ONG d'=C3=A9ducation *Passerelles Num=C3=A9rique* =C3=A0 Danan=
-g.
-
- Cette intervention se fait dans le cadre de la coop=C3=A9ration strat=C3=
-=A9gique
-et technologique entre la ville de Danang et LINAGORA Vietnam. Depuis 2015,
-les deux entit=C3=A9s coop=C3=A8rent et collaborent pour le d=C3=A9veloppem=
-ent de
-solutions d'*e-Gouvernance *bas=C3=A9es sur des technologies Open Source. F=
-in
-2016, les logiciels *OBM* (messagerie collaborative) et *LinShare* (partage
-de fichiers) de LINAGORA ont =C3=A9t=C3=A9 d=C3=A9ploy=C3=A9 pour 20 000 ad=
-ministr=C3=A9s de la
-ville Danang.
-
- Ce *Hackathon* unique en son genre s'est donn=C3=A9 trois objectifs :
-
-   - Pr=C3=A9senter d'une part le logiciel phare que nous d=C3=A9veloppons =
-:
-*OpenPaaS* (plate-forme de travail collaboratif de nouvelle g=C3=A9n=C3=A9r=
-ation),
-  - Pr=C3=A9senter d'autre part le projet *James* (mail serveur) de la
-fondation Apache, pour lequel nous contribuons et faire contribuer les
-=C3=A9tudiants sur ces deux logiciels.
-  - Enfin, faire d=C3=A9couvrir le m=C3=A9tier de d=C3=A9veloppeur dans une=
- entreprise
-internationale.
-
- Ce programme s'organise autour de diverses formations, de travaux
-pratiques (10 heures par semaine) autour des th=C3=A8mes de James et d'Open=
-PaaS
-: =C3=A9crire des tests, =C3=A9crire du code lisible, utiliser Java 8, util=
-iser
-JPA, cr=C3=A9er une interface REST, etc. La =C2=ABm=C3=A9thode agile=C2=BB =
-est utilis=C3=A9 et
-mise en avant pour structurer le travail, pratiquer du =C2=ABpair programmi=
-ng=C2=BB
-ainsi que de la revue de code, installer la plate-forme OpenPaaS sur leurs
-ordinateurs, etc.
-
- =C3=80 travers cette exp=C3=A9rience, les =C3=A9tudiants peuvent d=C3=A9co=
-uvrir le monde
-Open Source et les m=C3=A9thodes et exigences de d=C3=A9veloppeurs professi=
-onnels.
-<https://twitter.com/passerellesNume/status/844221561649483776>
- *Beno=C3=AEt Tellier, expert OpenPaaS et des =C3=A9tudiants suivant la for=
-mation.*
-
- Au terme de ces 15 jours de formation, LINAGORA est =C3=A0 la fois fi=C3=
-=A8re
-d'=C3=AAtre partenaire de *Passerelles Num=C3=A9riques* et surtout d'animer=
- ce
-*Hackathon* avec des =C3=A9tudiants si dynamiques et prometteurs. *Passerel=
-les
-Num=C3=A9riques* est une formidable association qui fait un excellent trava=
-il
-aupr=C3=A8s des plus jeunes. Elle a un vrai impact sur la soci=C3=A9t=C3=A9=
- gr=C3=A2ce =C3=A0
-son travail et ses valeurs.
-
- Ce partenariat et cette initiative vont dans le sens de notre objectif
-principal de LINAGORA Vietnam : contribuer =C3=A0 l'*ind=C3=A9pendance num=
-=C3=A9rique*
-du Vietnam via la fourniture des solutions d'e-Gouvernance* *Open Source
-aux administrations vietnamiennes et le d=C3=A9veloppement des programmes d=
-e
-formation de qualit=C3=A9 sur l'informatique et les technologies Open Sourc=
-e.
-<http://www.facebook.com/sharer/sharer.php?u=3D*|URL:ARCHIVE_LINK_SHORT|*> =
-
-Share
-<http://www.facebook.com/sharer/sharer.php?u=3D*|URL:ARCHIVE_LINK_SHORT|*>
-<http://twitter.com/intent/tweet?text=3D*|URL:MC_SUBJECT|*:
-*|URL:ARCHIVE_LINK_SHORT|*>   Tweet
-<http://twitter.com/intent/tweet?text=3D*|URL:MC_SUBJECT|*:
-*|URL:ARCHIVE_LINK_SHORT|*>
-<http://www.linkedin.com/shareArticle?url=3D*|URL:ARCHIVE_LINK_SHORT|*&amp;=
-mini=3Dtrue&amp;title=3D*|URL:MC_SUBJECT|*>
-  Share
-<http://www.linkedin.com/shareArticle?url=3D*|URL:ARCHIVE_LINK_SHORT|*&amp;=
-mini=3Dtrue&amp;title=3D*|URL:MC_SUBJECT|*>
-                                               *En savoir plus sur
-Passerelles Num=C3=A9riques :*
- Passerelles Num=C3=A9riques <https://www.passerellesnumeriques.org/fr/> es=
-t
-une ONG fran=C3=A7aise. Ils op=C3=A8rent au Cambodge, aux Philippines et au
-Vietnam. Leur mission est de permettre =C3=A0 des jeunes tr=C3=A8s d=C3=A9f=
-avoris=C3=A9s
-d=E2=80=99acc=C3=A9der =C3=A0 une =C3=A9ducation et =C3=A0 une formation te=
-chnique et
-professionnelle, dans le secteur du num=C3=A9rique. Cela leur permettra
-d=E2=80=99=C3=A9chapper durablement =C3=A0 la pauvret=C3=A9, et de contribu=
-er au
-d=C3=A9veloppement socio-=C3=A9conomique de leur pays.                  *Co=
-ntact
-presse :*
-
- *Robin Ledru* : communication@linagora.com et 06 33 87 88 64
-                     *Suivez nous sur nos diff=C3=A9rents r=C3=A9seaux soci=
-aux*
-<https://www.facebook.com/Linagora/> <https://twitter.com/linagora>
-<https://www.linkedin.com/company/linagora>
-<https://plus.google.com/108425659490539786266>
-<https://github.com/linagora> <https://www.linagora.com>
-<mailto:communication@linagora.com>
-                         *Copyright =C2=A9 2017 *|LIST:COMPANY|*, All right=
-s
-reserved.*
- *|LIST:DESCRIPTION|*
-
- *Our mailing address is:*
- *|HTML:LIST_ADDRESS_HTML|*
-
- Want to change how you receive these emails?
- You can update your preferences <*|UPDATE_PROFILE|*> or unsubscribe from
-this list <*|UNSUB|*>
-
---_av-17eAoYMNNKEIcqCToyLXBA
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-
-<!doctype html>
-<html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:schemas-microso=
-ft-com:vml" xmlns:o=3D"urn:schemas-microsoft-com:office:office">
-    <head>
-    =09<!-- NAME: ELEGANT -->
-        <!--[if gte mso 15]>
-=09=09<xml>
-=09=09=09<o:OfficeDocumentSettings>
-=09=09=09<o:AllowPNG/>
-=09=09=09<o:PixelsPerInch>96</o:PixelsPerInch>
-=09=09=09</o:OfficeDocumentSettings>
-=09=09</xml>
-=09=09<![endif]-->
-=09=09<meta charset=3D"UTF-8">
-        <meta http-equiv=3D"X-UA-Compatible" content=3D"IE=3Dedge">
-        <meta name=3D"viewport" content=3D"width=3Ddevice-width, initial-sc=
-ale=3D1">
-=09=09<title>*|MC:SUBJECT|*</title>
-
-    <style type=3D"text/css">
-=09=09p{
-=09=09=09margin:10px 0;
-=09=09=09padding:0;
-=09=09}
-=09=09table{
-=09=09=09border-collapse:collapse;
-=09=09}
-=09=09h1,h2,h3,h4,h5,h6{
-=09=09=09display:block;
-=09=09=09margin:0;
-=09=09=09padding:0;
-=09=09}
-=09=09img,a img{
-=09=09=09border:0;
-=09=09=09height:auto;
-=09=09=09outline:none;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09body,#bodyTable,#bodyCell{
-=09=09=09height:100%;
-=09=09=09margin:0;
-=09=09=09padding:0;
-=09=09=09width:100%;
-=09=09}
-=09=09#outlook a{
-=09=09=09padding:0;
-=09=09}
-=09=09img{
-=09=09=09-ms-interpolation-mode:bicubic;
-=09=09}
-=09=09table{
-=09=09=09mso-table-lspace:0pt;
-=09=09=09mso-table-rspace:0pt;
-=09=09}
-=09=09.ReadMsgBody{
-=09=09=09width:100%;
-=09=09}
-=09=09.ExternalClass{
-=09=09=09width:100%;
-=09=09}
-=09=09p,a,li,td,blockquote{
-=09=09=09mso-line-height-rule:exactly;
-=09=09}
-=09=09a[href^=3Dtel],a[href^=3Dsms]{
-=09=09=09color:inherit;
-=09=09=09cursor:default;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09p,a,li,td,body,table,blockquote{
-=09=09=09-ms-text-size-adjust:100%;
-=09=09=09-webkit-text-size-adjust:100%;
-=09=09}
-=09=09.ExternalClass,.ExternalClass p,.ExternalClass td,.ExternalClass div,=
-.ExternalClass span,.ExternalClass font{
-=09=09=09line-height:100%;
-=09=09}
-=09=09a[x-apple-data-detectors]{
-=09=09=09color:inherit !important;
-=09=09=09text-decoration:none !important;
-=09=09=09font-size:inherit !important;
-=09=09=09font-family:inherit !important;
-=09=09=09font-weight:inherit !important;
-=09=09=09line-height:inherit !important;
-=09=09}
-=09=09a.mcnButton{
-=09=09=09display:block;
-=09=09}
-=09=09.mcnImage{
-=09=09=09vertical-align:bottom;
-=09=09}
-=09=09.mcnTextContent{
-=09=09=09word-break:break-word;
-=09=09}
-=09=09.mcnTextContent img{
-=09=09=09height:auto !important;
-=09=09}
-=09=09.mcnDividerBlock{
-=09=09=09table-layout:fixed !important;
-=09=09}
-=09=09body,#bodyTable{
-=09=09=09background-color:#fffff0;
-=09=09}
-=09=09#bodyCell{
-=09=09=09border-top:0;
-=09=09}
-=09=09#templateContainer{
-=09=09=09border:0;
-=09=09}
-=09=09h1{
-=09=09=09color:#c61e42 !important;
-=09=09=09font-family:Georgia;
-=09=09=09font-size:30px;
-=09=09=09font-style:normal;
-=09=09=09font-weight:normal;
-=09=09=09line-height:125%;
-=09=09=09letter-spacing:0;
-=09=09=09text-align:center;
-=09=09}
-=09=09h2{
-=09=09=09color:#202020 !important;
-=09=09=09font-family:Georgia;
-=09=09=09font-size:26px;
-=09=09=09font-style:normal;
-=09=09=09font-weight:normal;
-=09=09=09line-height:125%;
-=09=09=09letter-spacing:normal;
-=09=09=09text-align:left;
-=09=09}
-=09=09h3{
-=09=09=09color:#202020 !important;
-=09=09=09font-family:Georgia;
-=09=09=09font-size:14px;
-=09=09=09font-style:normal;
-=09=09=09font-weight:normal;
-=09=09=09line-height:125%;
-=09=09=09letter-spacing:normal;
-=09=09=09text-align:center;
-=09=09}
-=09=09h4{
-=09=09=09color:#c61e42 !important;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:14px;
-=09=09=09font-style:normal;
-=09=09=09font-weight:normal;
-=09=09=09line-height:125%;
-=09=09=09letter-spacing:normal;
-=09=09=09text-align:left;
-=09=09}
-=09=09#templatePreheader{
-=09=09=09background-color:#c61e42;
-=09=09=09border-top:0;
-=09=09=09border-bottom:0;
-=09=09}
-=09=09.preheaderContainer .mcnTextContent,.preheaderContainer .mcnTextConte=
-nt p{
-=09=09=09color:#FFFFFF;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:10px;
-=09=09=09line-height:125%;
-=09=09=09text-align:left;
-=09=09}
-=09=09.preheaderContainer .mcnTextContent a{
-=09=09=09color:#FFFFFF;
-=09=09=09font-weight:normal;
-=09=09=09text-decoration:underline;
-=09=09}
-=09=09#templateHeader{
-=09=09=09background-color:#FFFFFF;
-=09=09=09border-top:0;
-=09=09=09border-bottom:0;
-=09=09}
-=09=09.headerContainer .mcnTextContent,.headerContainer .mcnTextContent p{
-=09=09=09color:#404040;
-=09=09=09font-family:Georgia;
-=09=09=09font-size:16px;
-=09=09=09line-height:150%;
-=09=09=09text-align:center;
-=09=09}
-=09=09.headerContainer .mcnTextContent a{
-=09=09=09color:#C52E26;
-=09=09=09font-weight:normal;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09#templateBody{
-=09=09=09background-color:#FFFFFF;
-=09=09=09border-top:0;
-=09=09=09border-bottom:0;
-=09=09}
-=09=09.bodyContainer .mcnTextContent,.bodyContainer .mcnTextContent p{
-=09=09=09color:#404040;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:14px;
-=09=09=09line-height:150%;
-=09=09=09text-align:left;
-=09=09}
-=09=09.bodyContainer .mcnTextContent a{
-=09=09=09color:#C52E26;
-=09=09=09font-weight:normal;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09#templateColumns{
-=09=09=09background-color:#FFFFFF;
-=09=09=09border-top:0;
-=09=09=09border-bottom:0;
-=09=09}
-=09=09.leftColumnContainer .mcnTextContent,.leftColumnContainer .mcnTextCon=
-tent p{
-=09=09=09color:#404040;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:12px;
-=09=09=09line-height:150%;
-=09=09=09text-align:left;
-=09=09}
-=09=09.leftColumnContainer .mcnTextContent a{
-=09=09=09color:#C52E26;
-=09=09=09font-weight:normal;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09.rightColumnContainer .mcnTextContent,.rightColumnContainer .mcnTextC=
-ontent p{
-=09=09=09color:#404040;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:12px;
-=09=09=09line-height:150%;
-=09=09=09text-align:left;
-=09=09}
-=09=09.rightColumnContainer .mcnTextContent a{
-=09=09=09color:#C52E26;
-=09=09=09font-weight:normal;
-=09=09=09text-decoration:none;
-=09=09}
-=09=09#templateFooter{
-=09=09=09background-color:#ECEAD4;
-=09=09=09border-top:0;
-=09=09=09border-bottom:0;
-=09=09}
-=09=09.footerContainer .mcnTextContent,.footerContainer .mcnTextContent p{
-=09=09=09color:#202020;
-=09=09=09font-family:Verdana;
-=09=09=09font-size:10px;
-=09=09=09line-height:125%;
-=09=09=09text-align:center;
-=09=09}
-=09=09.footerContainer .mcnTextContent a{
-=09=09=09color:#C52E26;
-=09=09=09font-weight:bold;
-=09=09=09text-decoration:none;
-=09=09}
-=09@media only screen and (max-width: 480px){
-=09=09body,table,td,p,a,li,blockquote{
-=09=09=09-webkit-text-size-adjust:none !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09body{
-=09=09=09width:100% !important;
-=09=09=09min-width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.templateContainer,#templatePreheader,#templateHeader,#templateBody,#=
-templateFooter{
-=09=09=09max-width:600px !important;
-=09=09=09width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.columnsContainer{
-=09=09=09display:block!important;
-=09=09=09max-width:600px !important;
-=09=09=09padding-bottom:18px !important;
-=09=09=09padding-left:0 !important;
-=09=09=09width:100%!important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImage{
-=09=09=09height:auto !important;
-=09=09=09width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnCartContainer,.mcnCaptionTopContent,.mcnRecContentContainer,.mcnC=
-aptionBottomContent,.mcnTextContentContainer,.mcnBoxedTextContentContainer,=
-.mcnImageGroupContentContainer,.mcnCaptionLeftTextContentContainer,.mcnCapt=
-ionRightTextContentContainer,.mcnCaptionLeftImageContentContainer,.mcnCapti=
-onRightImageContentContainer,.mcnImageCardLeftTextContentContainer,.mcnImag=
-eCardRightTextContentContainer{
-=09=09=09max-width:100% !important;
-=09=09=09width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnBoxedTextContentContainer{
-=09=09=09min-width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageGroupContent{
-=09=09=09padding:9px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnCaptionLeftContentOuter .mcnTextContent,.mcnCaptionRightContentOu=
-ter .mcnTextContent{
-=09=09=09padding-top:9px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageCardTopImageContent,.mcnCaptionBlockInner .mcnCaptionTopCont=
-ent:last-child .mcnTextContent{
-=09=09=09padding-top:18px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageCardBottomImageContent{
-=09=09=09padding-bottom:9px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageGroupBlockInner{
-=09=09=09padding-top:0 !important;
-=09=09=09padding-bottom:0 !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageGroupBlockOuter{
-=09=09=09padding-top:9px !important;
-=09=09=09padding-bottom:9px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnTextContent,.mcnBoxedTextContentColumn{
-=09=09=09padding-right:18px !important;
-=09=09=09padding-left:18px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnImageCardLeftImageContent,.mcnImageCardRightImageContent{
-=09=09=09padding-right:18px !important;
-=09=09=09padding-bottom:0 !important;
-=09=09=09padding-left:18px !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcpreview-image-uploader{
-=09=09=09display:none !important;
-=09=09=09width:100% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09h1{
-=09=09=09font-size:24px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09h2{
-=09=09=09font-size:20px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09h3{
-=09=09=09font-size:18px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09h4{
-=09=09=09font-size:16px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.mcnBoxedTextContentContainer .mcnTextContent,.mcnBoxedTextContentCon=
-tainer .mcnTextContent p{
-=09=09=09font-size:18px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09#templatePreheader{
-=09=09=09display:block !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.preheaderContainer .mcnTextContent,.preheaderContainer .mcnTextConte=
-nt p{
-=09=09=09font-size:14px !important;
-=09=09=09line-height:115% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.headerContainer .mcnTextContent,.headerContainer .mcnTextContent p{
-=09=09=09font-size:18px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.bodyContainer .mcnTextContent,.bodyContainer .mcnTextContent p{
-=09=09=09font-size:18px !important;
-=09=09=09line-height:125% !important;
-=09=09}
-
-}=09@media only screen and (max-width: 480px){
-=09=09.footerContainer .mcnTextContent,.footerContainer .mcnTextContent p{
-=09=09=09font-size:14px !important;
-=09=09=09line-height:115% !important;
-=09=09}
-
-}</style><!--[if !mso]><!--><link href=3D"https://fonts.googleapis.com/css?=
-family=3DOpen+Sans:400,400i,700,700i" rel=3D"stylesheet"><!--<![endif]--></=
-head>
-    <body leftmargin=3D"0" marginwidth=3D"0" topmargin=3D"0" marginheight=
-=3D"0" offset=3D"0" style=3D"height: 100%;margin: 0;padding: 0;width: 100%;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;background-color:=
- #fffff0;">
-        <center>
-            <table align=3D"center" border=3D"0" cellpadding=3D"0" cellspac=
-ing=3D"0" height=3D"100%" width=3D"100%" id=3D"bodyTable" style=3D"border-c=
-ollapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size=
--adjust: 100%;-webkit-text-size-adjust: 100%;height: 100%;margin: 0;padding=
-: 0;width: 100%;background-color: #fffff0;">
-                <tr>
-                    <td align=3D"center" valign=3D"top" id=3D"bodyCell" sty=
-le=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text=
--size-adjust: 100%;height: 100%;margin: 0;padding: 0;width: 100%;border-top=
-: 0;">
-                        <!-- BEGIN TEMPLATE // -->
-                        <table border=3D"0" cellpadding=3D"0" cellspacing=
-=3D"0" width=3D"600" class=3D"templateContainer" style=3D"border-collapse: =
-collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: =
-100%;-webkit-text-size-adjust: 100%;">
-                            <tr>
-                                <td align=3D"center" valign=3D"top" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!-- BEGIN PREHEADER // -->
-                                    <table border=3D"0" cellpadding=3D"0" c=
-ellspacing=3D"0" width=3D"600" id=3D"templatePreheader" style=3D"border-col=
-lapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-a=
-djust: 100%;-webkit-text-size-adjust: 100%;background-color: #c61e42;border=
--top: 0;border-bottom: 0;">
-                                        <tr>
-                                        =09<td valign=3D"top" class=3D"preh=
-eaderContainer" style=3D"padding-top: 9px;padding-bottom: 9px;mso-line-heig=
-ht-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;=
-"><table class=3D"mcnTextBlock" style=3D"min-width: 100%;border-collapse: c=
-ollapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 1=
-00%;-webkit-text-size-adjust: 100%;" width=3D"100%" cellspacing=3D"0" cellp=
-adding=3D"0" border=3D"0">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" style=3D"padding-top: 9px;mso-l=
-ine-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;" valign=3D"top">
-              =09<!--[if mso]>
-=09=09=09=09<table align=3D"left" border=3D"0" cellspacing=3D"0" cellpaddin=
-g=3D"0" width=3D"100%" style=3D"width:100%;">
-=09=09=09=09<tr>
-=09=09=09=09<![endif]-->
-=09=09=09
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"300" style=3D"width:300px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 300px;border-collapse: collapse;=
-mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-web=
-kit-text-size-adjust: 100%;" class=3D"mcnTextContentContainer" width=3D"100=
-%" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-left: 18px;padding-bottom: 9px;padding-right: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #FFFFFF;font-family: Verdana;font-size: 10px;l=
-ine-height: 125%;text-align: left;" valign=3D"top">
-
-                            <a href=3D"https://www.linagora.fr/" target=3D"=
-_blank" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-=
-webkit-text-size-adjust: 100%;color: #FFFFFF;font-weight: normal;text-decor=
-ation: underline;"><img alt=3D"Logo Linagora" data-file-id=3D"1814717" src=
-=3D"https://gallery.mailchimp.com/78e6559c68d5c9aec7650a2a6/images/a78496cb=
--77b1-4709-b4e1-2ec88b4112f0.png" style=3D"border: 0px;width: 100px;height:=
- 21px;margin: 0px;outline: none;text-decoration: none;-ms-interpolation-mod=
-e: bicubic;" width=3D"100" height=3D"21"></a>
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"300" style=3D"width:300px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 300px;border-collapse: collapse;=
-mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-web=
-kit-text-size-adjust: 100%;" class=3D"mcnTextContentContainer" width=3D"100=
-%" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-left: 18px;padding-bottom: 9px;padding-right: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #FFFFFF;font-family: Verdana;font-size: 10px;l=
-ine-height: 125%;text-align: left;" valign=3D"top">
-
-                            <div style=3D"text-align: right;"><a href=3D"*|=
-ARCHIVE|*" target=3D"_blank" style=3D"mso-line-height-rule: exactly;-ms-tex=
-t-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #FFFFFF;font-weig=
-ht: normal;text-decoration: underline;">Afficher l'email dans le navigateur=
-. </a></div>
-
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</tr>
-=09=09=09=09</table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table></td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END PREHEADER -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align=3D"center" valign=3D"top" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!-- BEGIN HEADER // -->
-                                    <table border=3D"0" cellpadding=3D"0" c=
-ellspacing=3D"0" width=3D"600" id=3D"templateHeader" style=3D"border-collap=
-se: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adju=
-st: 100%;-webkit-text-size-adjust: 100%;background-color: #FFFFFF;border-to=
-p: 0;border-bottom: 0;">
-                                        <tr>
-                                            <td valign=3D"top" class=3D"hea=
-derContainer" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: =
-100%;-webkit-text-size-adjust: 100%;"><table class=3D"mcnTextBlock" style=
-=3D"min-width: 100%;border-collapse: collapse;mso-table-lspace: 0pt;mso-tab=
-le-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" =
-border=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"100%">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" style=3D"padding-top: 9px;mso-l=
-ine-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;" valign=3D"top">
-              =09<!--[if mso]>
-=09=09=09=09<table align=3D"left" border=3D"0" cellspacing=3D"0" cellpaddin=
-g=3D"0" width=3D"100%" style=3D"width:100%;">
-=09=09=09=09<tr>
-=09=09=09=09<![endif]-->
-=09=09=09
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"600" style=3D"width:600px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 100%;min-width: 100%;border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnTextContentContaine=
-r" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D=
-"100%">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-right: 18px;padding-bottom: 9px;padding-left: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #404040;font-family: Georgia;font-size: 16px;l=
-ine-height: 150%;text-align: center;" valign=3D"top">
-
-                            <div style=3D"text-align: center;"><br>
-<span style=3D"font-size:23px"><span style=3D"font-family:open sans,helveti=
-ca neue,helvetica,arial,sans-serif"><strong>Hackathon sur les technologies =
-Open Source avec Passerelles Num=C3=A9riques =C3=A0 Danang<br>
-<br>
-<a href=3D"https://www.passerellesnumeriques.org/fr/nos-actions/vietnam/" s=
-tyle=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-te=
-xt-size-adjust: 100%;color: #C52E26;font-weight: normal;text-decoration: no=
-ne;"><img data-file-id=3D"1886169" src=3D"https://gallery.mailchimp.com/78e=
-6559c68d5c9aec7650a2a6/images/d989e2dd-b531-4a98-a71d-9b3f5625d001.png" sty=
-le=3D"border: 0px none;margin: 0px;height: auto !important;outline: none;te=
-xt-decoration: none;-ms-interpolation-mode: bicubic;" width=3D"281" height=
-=3D"85"></a></strong></span></span></div>
-
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</tr>
-=09=09=09=09</table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnDividerBlock" style=3D"min-width: 100%;border-co=
-llapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-=
-adjust: 100%;-webkit-text-size-adjust: 100%;table-layout: fixed !important;=
-" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
-    <tbody class=3D"mcnDividerBlockOuter">
-        <tr>
-            <td class=3D"mcnDividerBlockInner" style=3D"min-width: 100%;pad=
-ding: 18px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit=
--text-size-adjust: 100%;">
-                <table class=3D"mcnDividerContent" style=3D"min-width: 100%=
-;border-top: 2px solid #EAEAEA;border-collapse: collapse;mso-table-lspace: =
-0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adju=
-st: 100%;" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
-                    <tbody><tr>
-                        <td style=3D"mso-line-height-rule: exactly;-ms-text=
--size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                            <span></span>
-                        </td>
-                    </tr>
-                </tbody></table>
-<!--
-                <td class=3D"mcnDividerBlockInner" style=3D"padding: 18px;"=
->
-                <hr class=3D"mcnDividerContent" style=3D"border-bottom-colo=
-r:none; border-left-color:none; border-right-color:none; border-bottom-widt=
-h:0; border-left-width:0; border-right-width:0; margin-top:0; margin-right:=
-0; margin-bottom:0; margin-left:0;" />
--->
-            </td>
-        </tr>
-    </tbody>
-</table></td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END HEADER -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align=3D"center" valign=3D"top" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!-- BEGIN BODY // -->
-                                    <table border=3D"0" cellpadding=3D"0" c=
-ellspacing=3D"0" width=3D"600" id=3D"templateBody" style=3D"border-collapse=
-: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust=
-: 100%;-webkit-text-size-adjust: 100%;background-color: #FFFFFF;border-top:=
- 0;border-bottom: 0;">
-                                        <tr>
-                                            <td valign=3D"top" class=3D"bod=
-yContainer" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 10=
-0%;-webkit-text-size-adjust: 100%;"><table class=3D"mcnTextBlock" style=3D"=
-min-width: 100%;border-collapse: collapse;mso-table-lspace: 0pt;mso-table-r=
-space: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" bord=
-er=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"100%">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" style=3D"padding-top: 9px;mso-l=
-ine-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;" valign=3D"top">
-              =09<!--[if mso]>
-=09=09=09=09<table align=3D"left" border=3D"0" cellspacing=3D"0" cellpaddin=
-g=3D"0" width=3D"100%" style=3D"width:100%;">
-=09=09=09=09<tr>
-=09=09=09=09<![endif]-->
-=09=09=09
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"600" style=3D"width:600px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 100%;min-width: 100%;border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnTextContentContaine=
-r" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D=
-"100%">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-right: 18px;padding-bottom: 9px;padding-left: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #404040;font-family: Verdana;font-size: 14px;l=
-ine-height: 150%;text-align: left;" valign=3D"top">
-
-                            <p align=3D"justify" style=3D"margin: 10px 0;pa=
-dding: 0;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-t=
-ext-size-adjust: 100%;color: #404040;font-family: Verdana;font-size: 14px;l=
-ine-height: 150%;text-align: left;"><font face=3D"Liberation Sans, sans-ser=
-if"><font style=3D"font-size: 11pt" size=3D"2"><strong>LINAGORA</strong><st=
-rong> </strong><strong>est</strong><strong> fi=C3=A8re d'=C3=AAtre partenai=
-re de Passerelles Num=C3=A9riques </strong><strong>pour </strong><strong>an=
-im</strong><strong>er</strong><strong> </strong><strong>un</strong><strong>=
- </strong><strong>Hackathon</strong><strong> avec des </strong><strong>jeun=
-es</strong><strong> =C3=A9tudiants dynamiques et prometteurs.</strong></fon=
-t></font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><br>
-<font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size: 11pt" =
-size=3D"2">Du lundi 20 mars au 31 mars, l'=C3=A9quipe <strong>LINAGORA Viet=
-nam</strong>, et en particulier notre expert <a href=3D"http://open-paas.or=
-g/" target=3D"_blank" title=3D"Site web OpenPaaS" style=3D"mso-line-height-=
-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;col=
-or: #C52E26;font-weight: normal;text-decoration: none;"><span style=3D"colo=
-r:#0000FF"><strong>OpenPaaS</strong></span></a> Beno=C3=AEt Tellier, effect=
-ue un <strong>Hackathon</strong> sur les technologies <strong>Open Source</=
-strong> et l'environnement Linux avec une vingtaine d'=C3=A9tudiants vietna=
-miens =C3=A9voluant au sein de l'ONG d'=C3=A9ducation <strong>Passerelles N=
-um=C3=A9rique</strong> =C3=A0 Danang.</font></font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size=
-: 11pt" size=3D"2">Cette intervention se fait dans le cadre de la coop=C3=
-=A9ration strat=C3=A9gique et technologique entre la ville de Danang et LIN=
-AGORA Vietnam. Depuis 2015, les deux entit=C3=A9s coop=C3=A8rent et collabo=
-rent pour le d=C3=A9veloppement de solutions d'<strong>e-Gouvernance </stro=
-ng>bas=C3=A9es sur des technologies Open Source. Fin 2016, les logiciels <s=
-trong>OBM</strong> (messagerie collaborative) et <strong>LinShare</strong> =
-(partage de fichiers) de LINAGORA ont =C3=A9t=C3=A9 d=C3=A9ploy=C3=A9 pour =
-20 000 administr=C3=A9s de la ville Danang.</font></font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font style=3D"font-size: 11pt" size=3D"2"><font face=3D"Liberation=
- Sans, sans-serif">Ce </font><font face=3D"Liberation Sans, sans-serif"><st=
-rong>Hackathon</strong></font><font face=3D"Liberation Sans, sans-serif"> <=
-/font><font face=3D"Liberation Sans, sans-serif">unique en son genre </font=
-><font face=3D"Liberation Sans, sans-serif">s'</font><font face=3D"Liberati=
-on Sans, sans-serif">est</font><font face=3D"Liberation Sans, sans-serif"> =
-donn=C3=A9</font><font face=3D"Liberation Sans, sans-serif"> trois objectif=
-s : </font></font></p>
-
-<ol>
-=09<li align=3D"justify" style=3D"mso-line-height-rule: exactly;-ms-text-si=
-ze-adjust: 100%;-webkit-text-size-adjust: 100%;"><font style=3D"font-size: =
-11pt" size=3D"2"><font face=3D"Liberation Sans, sans-serif">Pr=C3=A9senter =
-</font><font face=3D"Liberation Sans, sans-serif">d'une </font><font face=
-=3D"Liberation Sans, sans-serif">part</font><font face=3D"Liberation Sans, =
-sans-serif"> </font><font face=3D"Liberation Sans, sans-serif">le</font><fo=
-nt face=3D"Liberation Sans, sans-serif"> logiciel </font><font face=3D"Libe=
-ration Sans, sans-serif">phare</font><font face=3D"Liberation Sans, sans-se=
-rif"> </font><font face=3D"Liberation Sans, sans-serif">que</font><font fac=
-e=3D"Liberation Sans, sans-serif"> </font><font face=3D"Liberation Sans, sa=
-ns-serif">nous</font><font face=3D"Liberation Sans, sans-serif"> </font><fo=
-nt face=3D"Liberation Sans, sans-serif">d=C3=A9veloppons : </font><font fac=
-e=3D"Liberation Sans, sans-serif"><strong>OpenPaaS</strong></font><font fac=
-e=3D"Liberation Sans, sans-serif"> </font><font face=3D"Liberation Sans, sa=
-ns-serif">(</font><font face=3D"Liberation Sans, sans-serif">plate-forme </=
-font><font face=3D"Liberation Sans, sans-serif">de travail collaboratif de =
-nouvelle g=C3=A9n=C3=A9ration</font><font face=3D"Liberation Sans, sans-ser=
-if">)</font><font face=3D"Liberation Sans, sans-serif">, </font></font></li=
->
-=09<li align=3D"justify" style=3D"mso-line-height-rule: exactly;-ms-text-si=
-ze-adjust: 100%;-webkit-text-size-adjust: 100%;"><font style=3D"font-size: =
-11pt" size=3D"2"><font face=3D"Liberation Sans, sans-serif">Pr=C3=A9senter =
-d'autre part</font><font face=3D"Liberation Sans, sans-serif"> le projet </=
-font><font face=3D"Liberation Sans, sans-serif"><strong>James</strong></fon=
-t><font face=3D"Liberation Sans, sans-serif"> </font><font face=3D"Liberati=
-on Sans, sans-serif">(</font><font face=3D"Liberation Sans, sans-serif">mai=
-l serveur</font><font face=3D"Liberation Sans, sans-serif">)</font><font fa=
-ce=3D"Liberation Sans, sans-serif"> de la fondation Apache, pour lequel nou=
-s contribuons et </font><font face=3D"Liberation Sans, sans-serif">faire co=
-ntribuer les =C3=A9tudiants </font><font face=3D"Liberation Sans, sans-seri=
-f">sur ces </font><font face=3D"Liberation Sans, sans-serif">deux</font><fo=
-nt face=3D"Liberation Sans, sans-serif"> logiciels.</font></font></li>
-=09<li align=3D"justify" style=3D"mso-line-height-rule: exactly;-ms-text-si=
-ze-adjust: 100%;-webkit-text-size-adjust: 100%;"><font style=3D"font-size: =
-11pt" size=3D"2"><font face=3D"Liberation Sans, sans-serif">Enfin, </font><=
-font face=3D"Liberation Sans, sans-serif">faire d=C3=A9couvrir le m=C3=A9ti=
-er de d=C3=A9veloppeur dans une entreprise </font><font face=3D"Liberation =
-Sans, sans-serif">internationale</font><font face=3D"Liberation Sans, sans-=
-serif">.</font></font></li>
-</ol>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size=
-: 11pt" size=3D"2">Ce programme s'organise autour de diverses formations, d=
-e travaux pratiques (10 heures par semaine) autour des th=C3=A8mes de James=
- et d'OpenPaaS : =C3=A9crire des tests, =C3=A9crire du code lisible, utilis=
-er Java 8, utiliser JPA, cr=C3=A9er une interface REST, etc. La =C2=ABm=C3=
-=A9thode agile=C2=BB est utilis=C3=A9 et mise en avant pour structurer le t=
-ravail, pratiquer du =C2=ABpair programming=C2=BB ainsi que de la revue de =
-code, installer la plate-forme OpenPaaS sur leurs ordinateurs, etc.</font><=
-/font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size=
-: 11pt" size=3D"2">=C3=80 travers cette exp=C3=A9rience, les =C3=A9tudiants=
- peuvent d=C3=A9couvrir le monde Open Source et les m=C3=A9thodes et exigen=
-ces de d=C3=A9veloppeurs professionnels.</font></font><br>
-&nbsp;</p>
-
-<p style=3D"text-align: center;margin: 10px 0;padding: 0;mso-line-height-ru=
-le: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color=
-: #404040;font-family: Verdana;font-size: 14px;line-height: 150%;"><font fa=
-ce=3D"Liberation Sans, sans-serif"><font style=3D"font-size: 11pt" size=3D"=
-2"><a href=3D"https://twitter.com/passerellesNume/status/844221561649483776=
-" target=3D"_blank" style=3D"mso-line-height-rule: exactly;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;color: #C52E26;font-weight: norma=
-l;text-decoration: none;"><img data-file-id=3D"1911553" src=3D"https://gall=
-ery.mailchimp.com/78e6559c68d5c9aec7650a2a6/images/fbb0d956-f957-4869-88ad-=
-3d0a2eeadb0c.jpg" style=3D"border: 0px;width: 550px;height: 367px;margin: 0=
-px;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" wi=
-dth=3D"550" height=3D"367"></a></font></font><br>
-<font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size: 11pt" =
-size=3D"2"><em>Beno=C3=AEt Tellier, expert OpenPaaS et des =C3=A9tudiants s=
-uivant la formation.</em></font></font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size=
-: 11pt" size=3D"2">Au terme de ces 15 jours de formation, LINAGORA est =C3=
-=A0 la fois fi=C3=A8re d'=C3=AAtre partenaire de <strong>Passerelles Num=C3=
-=A9riques</strong> et surtout d'animer ce <strong>Hackathon</strong> avec d=
-es =C3=A9tudiants si dynamiques et prometteurs. <strong>Passerelles Num=C3=
-=A9riques</strong> est une formidable association qui fait un excellent tra=
-vail aupr=C3=A8s des plus jeunes. Elle a un vrai impact sur la soci=C3=A9t=
-=C3=A9 gr=C3=A2ce =C3=A0 son travail et ses valeurs.</font></font></p>
-
-<p align=3D"justify" style=3D"margin: 10px 0;padding: 0;mso-line-height-rul=
-e: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color:=
- #404040;font-family: Verdana;font-size: 14px;line-height: 150%;text-align:=
- left;"><font face=3D"Liberation Sans, sans-serif"><font style=3D"font-size=
-: 11pt" size=3D"2">Ce partenariat et cette initiative vont dans le sens de =
-no</font><font style=3D"font-size: 11pt" size=3D"2">tre</font><font style=
-=3D"font-size: 11pt" size=3D"2"> objectif </font><font style=3D"font-size: =
-11pt" size=3D"2">principal</font><font style=3D"font-size: 11pt" size=3D"2"=
-> </font><font style=3D"font-size: 11pt" size=3D"2">de LINAGORA</font><font=
- style=3D"font-size: 11pt" size=3D"2"> Vietnam</font><font style=3D"font-si=
-ze: 11pt" size=3D"2"> : contribuer =C3=A0 l'<strong>ind=C3=A9pendance num=
-=C3=A9rique</strong> du Vietnam </font><font style=3D"font-size: 11pt" size=
-=3D"2">via la fourniture</font><font style=3D"font-size: 11pt" size=3D"2"> =
-des solutions d'</font><font style=3D"font-size: 11pt" size=3D"2">e-Gouvern=
-ance<strong> </strong></font><font style=3D"font-size: 11pt" size=3D"2">Ope=
-n Source</font><font style=3D"font-size: 11pt" size=3D"2"> aux </font><font=
- style=3D"font-size: 11pt" size=3D"2">administrations</font><font style=3D"=
-font-size: 11pt" size=3D"2"> vietnamiennes </font><font style=3D"font-size:=
- 11pt" size=3D"2">et le d=C3=A9veloppement</font><font style=3D"font-size: =
-11pt" size=3D"2"> des </font><font style=3D"font-size: 11pt" size=3D"2">pro=
-grammes de</font><font style=3D"font-size: 11pt" size=3D"2"> formation de q=
-ualit=C3=A9 sur </font><font style=3D"font-size: 11pt" size=3D"2">l'informa=
-tique et</font><font style=3D"font-size: 11pt" size=3D"2"> l</font><font st=
-yle=3D"font-size: 11pt" size=3D"2">es</font><font style=3D"font-size: 11pt"=
- size=3D"2"> technologie</font><font style=3D"font-size: 11pt" size=3D"2">s=
-</font><font style=3D"font-size: 11pt" size=3D"2"> </font><font style=3D"fo=
-nt-size: 11pt" size=3D"2">O</font><font style=3D"font-size: 11pt" size=3D"2=
-">pen </font><font style=3D"font-size: 11pt" size=3D"2">S</font><font style=
-=3D"font-size: 11pt" size=3D"2">ource</font><font style=3D"font-size: 11pt"=
- size=3D"2">.</font></font></p>
-
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</tr>
-=09=09=09=09</table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnShareBlock" style=3D"min-width: 100%;border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;" border=3D"0" cellspacing=3D"0" =
-cellpadding=3D"0" width=3D"100%">
-    <tbody class=3D"mcnShareBlockOuter">
-            <tr>
-                <td style=3D"padding: 9px;mso-line-height-rule: exactly;-ms=
--text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnShareB=
-lockInner" valign=3D"top">
-                    <table class=3D"mcnShareContentContainer" style=3D"min-=
-width: 100%;border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspac=
-e: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" border=
-=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"100%">
-    <tbody><tr>
-        <td style=3D"padding-top: 0;padding-left: 9px;padding-bottom: 0;pad=
-ding-right: 9px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-w=
-ebkit-text-size-adjust: 100%;" align=3D"center">
-            <table style=3D"min-width: 100%;border-collapse: collapse;mso-t=
-able-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-t=
-ext-size-adjust: 100%;" class=3D"mcnShareContent" border=3D"0" cellspacing=
-=3D"0" cellpadding=3D"0" align=3D"center" width=3D"100%">
-                <tbody><tr>
-                    <td class=3D"mcnShareContentItemContainer" style=3D"pad=
-ding-top: 9px;padding-right: 9px;padding-left: 9px;mso-line-height-rule: ex=
-actly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" valign=3D=
-"top" align=3D"center">
-                        <table border=3D"0" cellspacing=3D"0" cellpadding=
-=3D"0" align=3D"center" style=3D"border-collapse: collapse;mso-table-lspace=
-: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-ad=
-just: 100%;">
-                            <tbody><tr>
-                                <td valign=3D"top" align=3D"left" style=3D"=
-mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-=
-adjust: 100%;">
-                                    <!--[if mso]>
-                                    <table align=3D"center" border=3D"0" ce=
-llspacing=3D"0" cellpadding=3D"0">
-                                    <tr>
-                                    <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-                                        <table border=3D"0" cellspacing=3D"=
-0" cellpadding=3D"0" align=3D"left" style=3D"border-collapse: collapse;mso-=
-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-=
-text-size-adjust: 100%;">
-                                            <tbody><tr>
-                                                <td style=3D"padding-right:=
- 9px;padding-bottom: 9px;mso-line-height-rule: exactly;-ms-text-size-adjust=
-: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnShareContentItemContain=
-er" valign=3D"top">
-                                                    <table class=3D"mcnShar=
-eContentItem" style=3D"border-collapse: separate;border-radius: 3px;mso-tab=
-le-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-tex=
-t-size-adjust: 100%;" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" widt=
-h=3D"">
-                                                        <tbody><tr>
-                                                            <td style=3D"pa=
-dding-top: 5px;padding-right: 9px;padding-bottom: 5px;padding-left: 9px;mso=
--line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adj=
-ust: 100%;" valign=3D"middle" align=3D"left">
-                                                                <table bord=
-er=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D"" styl=
-e=3D"border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                                                    <tbody>=
-<tr>
-                                                                        <td=
- class=3D"mcnShareIconContent" valign=3D"middle" align=3D"center" width=3D"=
-24" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;">
-                                                                           =
- <a href=3D"http://www.facebook.com/sharer/sharer.php?u=3D*|URL:ARCHIVE_LIN=
-K_SHORT|*" target=3D"_blank" style=3D"mso-line-height-rule: exactly;-ms-tex=
-t-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img src=3D"https://cd=
-n-images.mailchimp.com/icons/social-block-v2/color-facebook-48.png" style=
-=3D"display: block;border: 0;height: auto;outline: none;text-decoration: no=
-ne;-ms-interpolation-mode: bicubic;" class=3D"" width=3D"24" height=3D"24">=
-</a>
-                                                                        </t=
-d>
-                                                                        <td=
- class=3D"mcnShareTextContent" style=3D"padding-left: 5px;mso-line-height-r=
-ule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" va=
-lign=3D"middle" align=3D"left">
-                                                                           =
- <a href=3D"http://www.facebook.com/sharer/sharer.php?u=3D*|URL:ARCHIVE_LIN=
-K_SHORT|*" target=3D"" style=3D"color: #202020;font-family: Arial;font-size=
-: 12px;font-weight: normal;line-height: normal;text-align: center;text-deco=
-ration: none;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;">Share</a>
-                                                                        </t=
-d>
-                                                                    </tr>
-                                                                </tbody></t=
-able>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody></table>
-                                                </td>
-                                            </tr>
-                                        </tbody></table>
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-                                        <table border=3D"0" cellspacing=3D"=
-0" cellpadding=3D"0" align=3D"left" style=3D"border-collapse: collapse;mso-=
-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-=
-text-size-adjust: 100%;">
-                                            <tbody><tr>
-                                                <td style=3D"padding-right:=
- 9px;padding-bottom: 9px;mso-line-height-rule: exactly;-ms-text-size-adjust=
-: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnShareContentItemContain=
-er" valign=3D"top">
-                                                    <table class=3D"mcnShar=
-eContentItem" style=3D"border-collapse: separate;border-radius: 3px;mso-tab=
-le-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-tex=
-t-size-adjust: 100%;" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" widt=
-h=3D"">
-                                                        <tbody><tr>
-                                                            <td style=3D"pa=
-dding-top: 5px;padding-right: 9px;padding-bottom: 5px;padding-left: 9px;mso=
--line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adj=
-ust: 100%;" valign=3D"middle" align=3D"left">
-                                                                <table bord=
-er=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D"" styl=
-e=3D"border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                                                    <tbody>=
-<tr>
-                                                                        <td=
- class=3D"mcnShareIconContent" valign=3D"middle" align=3D"center" width=3D"=
-24" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;">
-                                                                           =
- <a href=3D"http://twitter.com/intent/tweet?text=3D*|URL:MC_SUBJECT|*: *|UR=
-L:ARCHIVE_LINK_SHORT|*" target=3D"_blank" style=3D"mso-line-height-rule: ex=
-actly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img src=
-=3D"https://cdn-images.mailchimp.com/icons/social-block-v2/color-twitter-48=
-.png" style=3D"display: block;border: 0;height: auto;outline: none;text-dec=
-oration: none;-ms-interpolation-mode: bicubic;" class=3D"" width=3D"24" hei=
-ght=3D"24"></a>
-                                                                        </t=
-d>
-                                                                        <td=
- class=3D"mcnShareTextContent" style=3D"padding-left: 5px;mso-line-height-r=
-ule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" va=
-lign=3D"middle" align=3D"left">
-                                                                           =
- <a href=3D"http://twitter.com/intent/tweet?text=3D*|URL:MC_SUBJECT|*: *|UR=
-L:ARCHIVE_LINK_SHORT|*" target=3D"" style=3D"color: #202020;font-family: Ar=
-ial;font-size: 12px;font-weight: normal;line-height: normal;text-align: cen=
-ter;text-decoration: none;mso-line-height-rule: exactly;-ms-text-size-adjus=
-t: 100%;-webkit-text-size-adjust: 100%;">Tweet</a>
-                                                                        </t=
-d>
-                                                                    </tr>
-                                                                </tbody></t=
-able>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody></table>
-                                                </td>
-                                            </tr>
-                                        </tbody></table>
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-                                        <table border=3D"0" cellspacing=3D"=
-0" cellpadding=3D"0" align=3D"left" style=3D"border-collapse: collapse;mso-=
-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-=
-text-size-adjust: 100%;">
-                                            <tbody><tr>
-                                                <td style=3D"padding-right:=
- 0;padding-bottom: 9px;mso-line-height-rule: exactly;-ms-text-size-adjust: =
-100%;-webkit-text-size-adjust: 100%;" class=3D"mcnShareContentItemContainer=
-" valign=3D"top">
-                                                    <table class=3D"mcnShar=
-eContentItem" style=3D"border-collapse: separate;border-radius: 3px;mso-tab=
-le-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-tex=
-t-size-adjust: 100%;" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" widt=
-h=3D"">
-                                                        <tbody><tr>
-                                                            <td style=3D"pa=
-dding-top: 5px;padding-right: 9px;padding-bottom: 5px;padding-left: 9px;mso=
--line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adj=
-ust: 100%;" valign=3D"middle" align=3D"left">
-                                                                <table bord=
-er=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D"" styl=
-e=3D"border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                                                    <tbody>=
-<tr>
-                                                                        <td=
- class=3D"mcnShareIconContent" valign=3D"middle" align=3D"center" width=3D"=
-24" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;">
-                                                                           =
- <a href=3D"http://www.linkedin.com/shareArticle?url=3D*|URL:ARCHIVE_LINK_S=
-HORT|*&amp;mini=3Dtrue&amp;title=3D*|URL:MC_SUBJECT|*" target=3D"_blank" st=
-yle=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-tex=
-t-size-adjust: 100%;"><img src=3D"https://cdn-images.mailchimp.com/icons/so=
-cial-block-v2/color-linkedin-48.png" style=3D"display: block;border: 0;heig=
-ht: auto;outline: none;text-decoration: none;-ms-interpolation-mode: bicubi=
-c;" class=3D"" width=3D"24" height=3D"24"></a>
-                                                                        </t=
-d>
-                                                                        <td=
- class=3D"mcnShareTextContent" style=3D"padding-left: 5px;mso-line-height-r=
-ule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" va=
-lign=3D"middle" align=3D"left">
-                                                                           =
- <a href=3D"http://www.linkedin.com/shareArticle?url=3D*|URL:ARCHIVE_LINK_S=
-HORT|*&amp;mini=3Dtrue&amp;title=3D*|URL:MC_SUBJECT|*" target=3D"" style=3D=
-"color: #202020;font-family: Arial;font-size: 12px;font-weight: normal;line=
--height: normal;text-align: center;text-decoration: none;mso-line-height-ru=
-le: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">Sha=
-re</a>
-                                                                        </t=
-d>
-                                                                    </tr>
-                                                                </tbody></t=
-able>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody></table>
-                                                </td>
-                                            </tr>
-                                        </tbody></table>
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                    <!--[if mso]>
-                                    </tr>
-                                    </table>
-                                    <![endif]-->
-                                </td>
-                            </tr>
-                        </tbody></table>
-                    </td>
-                </tr>
-            </tbody></table>
-        </td>
-    </tr>
-</tbody></table>
-
-                </td>
-            </tr>
-    </tbody>
-</table><table class=3D"mcnDividerBlock" style=3D"min-width: 100%;border-co=
-llapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-=
-adjust: 100%;-webkit-text-size-adjust: 100%;table-layout: fixed !important;=
-" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"100%">
-    <tbody class=3D"mcnDividerBlockOuter">
-        <tr>
-            <td class=3D"mcnDividerBlockInner" style=3D"min-width: 100%;pad=
-ding: 18px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit=
--text-size-adjust: 100%;">
-                <table class=3D"mcnDividerContent" style=3D"min-width: 100%=
-;border-top: 2px solid #EAEAEA;border-collapse: collapse;mso-table-lspace: =
-0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adju=
-st: 100%;" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"100%">
-                    <tbody><tr>
-                        <td style=3D"mso-line-height-rule: exactly;-ms-text=
--size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                            <span></span>
-                        </td>
-                    </tr>
-                </tbody></table>
-<!--
-                <td class=3D"mcnDividerBlockInner" style=3D"padding: 18px;"=
->
-                <hr class=3D"mcnDividerContent" style=3D"border-bottom-colo=
-r:none; border-left-color:none; border-right-color:none; border-bottom-widt=
-h:0; border-left-width:0; border-right-width:0; margin-top:0; margin-right:=
-0; margin-bottom:0; margin-left:0;" />
--->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnTextBlock" style=3D"min-width: 100%;border-colla=
-pse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adj=
-ust: 100%;-webkit-text-size-adjust: 100%;" border=3D"0" cellspacing=3D"0" c=
-ellpadding=3D"0" width=3D"100%">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" style=3D"padding-top: 9px;mso-l=
-ine-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;" valign=3D"top">
-              =09<!--[if mso]>
-=09=09=09=09<table align=3D"left" border=3D"0" cellspacing=3D"0" cellpaddin=
-g=3D"0" width=3D"100%" style=3D"width:100%;">
-=09=09=09=09<tr>
-=09=09=09=09<![endif]-->
-=09=09=09
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"600" style=3D"width:600px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 100%;min-width: 100%;border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnTextContentContaine=
-r" border=3D"0" cellspacing=3D"0" cellpadding=3D"0" align=3D"left" width=3D=
-"100%">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-right: 18px;padding-bottom: 9px;padding-left: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #404040;font-family: Verdana;font-size: 14px;l=
-ine-height: 150%;text-align: left;" valign=3D"top">
-
-                            <span style=3D"font-size:14px"><span style=3D"f=
-ont-family:tahoma,verdana,segoe,sans-serif"><strong>En savoir plus sur Pass=
-erelles Num=C3=A9riques :</strong></span></span><br>
-<span style=3D"font-size:12px"><span style=3D"font-family:tahoma,verdana,se=
-goe,sans-serif"><a href=3D"https://www.passerellesnumeriques.org/fr/" targe=
-t=3D"_blank" title=3D"Site web Passerelles Num=C3=A9riques" style=3D"mso-li=
-ne-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust=
-: 100%;color: #C52E26;font-weight: normal;text-decoration: none;">Passerell=
-es Num=C3=A9riques</a> est une ONG fran=C3=A7aise. Ils op=C3=A8rent au Camb=
-odge, aux Philippines et au Vietnam. Leur mission est de permettre =C3=A0 d=
-es jeunes tr=C3=A8s d=C3=A9favoris=C3=A9s d=E2=80=99acc=C3=A9der =C3=A0 une=
- =C3=A9ducation et =C3=A0 une formation technique et professionnelle, dans =
-le secteur du num=C3=A9rique. Cela leur permettra d=E2=80=99=C3=A9chapper d=
-urablement =C3=A0 la pauvret=C3=A9, et de contribuer au d=C3=A9veloppement =
-socio-=C3=A9conomique de leur pays.</span></span>
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</tr>
-=09=09=09=09</table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnTextBlock" style=3D"min-width: 100%;border-colla=
-pse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adj=
-ust: 100%;-webkit-text-size-adjust: 100%;" width=3D"100%" cellspacing=3D"0"=
- cellpadding=3D"0" border=3D"0">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" style=3D"padding-top: 9px;mso-l=
-ine-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;" valign=3D"top">
-              =09<!--[if mso]>
-=09=09=09=09<table align=3D"left" border=3D"0" cellspacing=3D"0" cellpaddin=
-g=3D"0" width=3D"100%" style=3D"width:100%;">
-=09=09=09=09<tr>
-=09=09=09=09<![endif]-->
-=09=09=09
-=09=09=09=09<!--[if mso]>
-=09=09=09=09<td valign=3D"top" width=3D"600" style=3D"width:600px;">
-=09=09=09=09<![endif]-->
-                <table style=3D"max-width: 100%;min-width: 100%;border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnTextContentContaine=
-r" width=3D"100%" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D=
-"left">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-0;padding-right: 18px;padding-bottom: 9px;padding-left: 18px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;w=
-ord-break: break-word;color: #404040;font-family: Verdana;font-size: 14px;l=
-ine-height: 150%;text-align: left;" valign=3D"top">
-
-                            <u><span style=3D"font-family:tahoma,verdana,se=
-goe,sans-serif"><strong>Contact presse :</strong></span></u><br>
-<br>
-<span style=3D"font-family:tahoma,verdana,segoe,sans-serif"><strong>Robin L=
-edru</strong> : communication@linagora.com et 06 33 87 88 64</span>
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if mso]>
-=09=09=09=09</tr>
-=09=09=09=09</table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnDividerBlock" style=3D"min-width: 100%;border-co=
-llapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-=
-adjust: 100%;-webkit-text-size-adjust: 100%;table-layout: fixed !important;=
-" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
-    <tbody class=3D"mcnDividerBlockOuter">
-        <tr>
-            <td class=3D"mcnDividerBlockInner" style=3D"min-width: 100%;pad=
-ding: 9px 18px 0px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%=
-;-webkit-text-size-adjust: 100%;">
-                <table class=3D"mcnDividerContent" style=3D"min-width: 100%=
-;border-top: 1px solid #CCCCCC;border-collapse: collapse;mso-table-lspace: =
-0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adju=
-st: 100%;" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
-                    <tbody><tr>
-                        <td style=3D"mso-line-height-rule: exactly;-ms-text=
--size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                            <span></span>
-                        </td>
-                    </tr>
-                </tbody></table>
-<!--
-                <td class=3D"mcnDividerBlockInner" style=3D"padding: 18px;"=
->
-                <hr class=3D"mcnDividerContent" style=3D"border-bottom-colo=
-r:none; border-left-color:none; border-right-color:none; border-bottom-widt=
-h:0; border-left-width:0; border-right-width:0; margin-top:0; margin-right:=
-0; margin-bottom:0; margin-left:0;" />
--->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnBoxedTextBlock" style=3D"min-width: 100%;border-=
-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-siz=
-e-adjust: 100%;-webkit-text-size-adjust: 100%;" width=3D"100%" cellspacing=
-=3D"0" cellpadding=3D"0" border=3D"0">
-    <!--[if gte mso 9]>
-=09<table align=3D"center" border=3D"0" cellspacing=3D"0" cellpadding=3D"0"=
- width=3D"100%">
-=09<![endif]-->
-=09<tbody class=3D"mcnBoxedTextBlockOuter">
-        <tr>
-            <td class=3D"mcnBoxedTextBlockInner" valign=3D"top" style=3D"ms=
-o-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-ad=
-just: 100%;">
-
-=09=09=09=09<!--[if gte mso 9]>
-=09=09=09=09<td align=3D"center" valign=3D"top" ">
-=09=09=09=09<![endif]-->
-                <table style=3D"min-width: 100%;border-collapse: collapse;m=
-so-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;" class=3D"mcnBoxedTextContentContainer" width=3D=
-"100%" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-                    <tbody><tr>
-
-                        <td style=3D"padding-top: 9px;padding-left: 18px;pa=
-dding-bottom: 9px;padding-right: 18px;mso-line-height-rule: exactly;-ms-tex=
-t-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-
-                            <table class=3D"mcnTextContentContainer" style=
-=3D"min-width: 100% ! important;background-color: #404040;border-collapse: =
-collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: =
-100%;-webkit-text-size-adjust: 100%;" width=3D"100%" cellspacing=3D"0" cell=
-padding=3D"18" border=3D"0">
-                                <tbody><tr>
-                                    <td class=3D"mcnTextContent" style=3D"c=
-olor: #F2F2F2;font-family: &quot;Open Sans&quot;,&quot;Helvetica Neue&quot;=
-,Helvetica,Arial,sans-serif;font-size: 16px;font-weight: normal;text-align:=
- center;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-te=
-xt-size-adjust: 100%;word-break: break-word;line-height: 150%;" valign=3D"t=
-op">
-                                        <strong>Suivez nous sur nos diff=C3=
-=A9rents r=C3=A9seaux sociaux</strong>
-                                    </td>
-                                </tr>
-                            </tbody></table>
-                        </td>
-                    </tr>
-                </tbody></table>
-=09=09=09=09<!--[if gte mso 9]>
-=09=09=09=09</td>
-=09=09=09=09<![endif]-->
-
-=09=09=09=09<!--[if gte mso 9]>
-                </tr>
-                </table>
-=09=09=09=09<![endif]-->
-            </td>
-        </tr>
-    </tbody>
-</table><table class=3D"mcnFollowBlock" style=3D"min-width: 100%;border-col=
-lapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-a=
-djust: 100%;-webkit-text-size-adjust: 100%;" width=3D"100%" cellspacing=3D"=
-0" cellpadding=3D"0" border=3D"0">
-    <tbody class=3D"mcnFollowBlockOuter">
-        <tr>
-            <td style=3D"padding: 9px;mso-line-height-rule: exactly;-ms-tex=
-t-size-adjust: 100%;-webkit-text-size-adjust: 100%;" class=3D"mcnFollowBloc=
-kInner" valign=3D"top" align=3D"center">
-                <table class=3D"mcnFollowContentContainer" style=3D"min-wid=
-th: 100%;border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: =
-0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" width=3D"10=
-0%" cellspacing=3D"0" cellpadding=3D"0" border=3D"0">
-    <tbody><tr>
-        <td style=3D"padding-left: 9px;padding-right: 9px;mso-line-height-r=
-ule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" al=
-ign=3D"center">
-            <table style=3D"min-width: 100%;border-collapse: collapse;mso-t=
-able-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-t=
-ext-size-adjust: 100%;" class=3D"mcnFollowContent" width=3D"100%" cellspaci=
-ng=3D"0" cellpadding=3D"0" border=3D"0">
-                <tbody><tr>
-                    <td style=3D"padding-top: 9px;padding-right: 9px;paddin=
-g-left: 9px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webki=
-t-text-size-adjust: 100%;" valign=3D"top" align=3D"center">
-                        <table cellspacing=3D"0" cellpadding=3D"0" border=
-=3D"0" align=3D"center" style=3D"border-collapse: collapse;mso-table-lspace=
-: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-ad=
-just: 100%;">
-                            <tbody><tr>
-                                <td valign=3D"top" align=3D"center" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!--[if mso]>
-                                    <table align=3D"center" border=3D"0" ce=
-llspacing=3D"0" cellpadding=3D"0">
-                                    <tr>
-                                    <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-www.facebook.com/Linagora/" target=3D"_blank" style=3D"mso-line-height-rule=
-: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img =
-src=3D"https://cdn-images.mailchimp.com/icons/social-block-v2/light-faceboo=
-k-96.png" alt=3D"Linagora's Facebook" class=3D"mcnFollowBlockIcon" style=3D=
-"width: 48px;max-width: 48px;display: block;border: 0;height: auto;outline:=
- none;text-decoration: none;-ms-interpolation-mode: bicubic;" width=3D"48">=
-</a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-twitter.com/linagora" target=3D"_blank" style=3D"mso-line-height-rule: exac=
-tly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img src=3D=
-"https://cdn-images.mailchimp.com/icons/social-block-v2/light-twitter-96.pn=
-g" alt=3D"Linagora's Twitter" class=3D"mcnFollowBlockIcon" style=3D"width: =
-48px;max-width: 48px;display: block;border: 0;height: auto;outline: none;te=
-xt-decoration: none;-ms-interpolation-mode: bicubic;" width=3D"48"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-www.linkedin.com/company/linagora" target=3D"_blank" style=3D"mso-line-heig=
-ht-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;=
-"><img src=3D"https://cdn-images.mailchimp.com/icons/social-block-v2/light-=
-linkedin-96.png" alt=3D"Linagora's LinkedIn" class=3D"mcnFollowBlockIcon" s=
-tyle=3D"width: 48px;max-width: 48px;display: block;border: 0;height: auto;o=
-utline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" width=
-=3D"48"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-plus.google.com/108425659490539786266" target=3D"_blank" style=3D"mso-line-=
-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 1=
-00%;"><img src=3D"https://cdn-images.mailchimp.com/icons/social-block-v2/li=
-ght-googleplus-96.png" alt=3D"Linagora's G+" class=3D"mcnFollowBlockIcon" s=
-tyle=3D"width: 48px;max-width: 48px;display: block;border: 0;height: auto;o=
-utline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" width=
-=3D"48"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-github.com/linagora" target=3D"_blank" style=3D"mso-line-height-rule: exact=
-ly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img src=3D"=
-https://cdn-images.mailchimp.com/icons/social-block-v2/light-github-96.png"=
- alt=3D"Linagora's GitHub" class=3D"mcnFollowBlockIcon" style=3D"width: 48p=
-x;max-width: 48px;display: block;border: 0;height: auto;outline: none;text-=
-decoration: none;-ms-interpolation-mode: bicubic;" width=3D"48"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 10px;padding-bottom: 9px;mso-line-heigh=
-t-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"=
- valign=3D"top" align=3D"center">
-                                                        <a href=3D"https://=
-www.linagora.com" target=3D"_blank" style=3D"mso-line-height-rule: exactly;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img src=3D"htt=
-ps://cdn-images.mailchimp.com/icons/social-block-v2/light-link-96.png" alt=
-=3D"Linagora's website" class=3D"mcnFollowBlockIcon" style=3D"width: 48px;m=
-ax-width: 48px;display: block;border: 0;height: auto;outline: none;text-dec=
-oration: none;-ms-interpolation-mode: bicubic;" width=3D"48"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                        <!--[if mso]>
-                                        <td align=3D"center" valign=3D"top"=
->
-                                        <![endif]-->
-
-                                            <table class=3D"mcnFollowStacke=
-d" style=3D"display: inline;border-collapse: collapse;mso-table-lspace: 0pt=
-;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;" cellspacing=3D"0" cellpadding=3D"0" border=3D"0" align=3D"left">
-
-                                                <tbody><tr>
-                                                    <td class=3D"mcnFollowI=
-conContent" style=3D"padding-right: 0;padding-bottom: 9px;mso-line-height-r=
-ule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" va=
-lign=3D"top" align=3D"center">
-                                                        <a href=3D"mailto:c=
-ommunication@linagora.com" target=3D"_blank" style=3D"mso-line-height-rule:=
- exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"><img s=
-rc=3D"https://cdn-images.mailchimp.com/icons/social-block-v2/light-forwardt=
-ofriend-96.png" alt=3D"Linagora's email" class=3D"mcnFollowBlockIcon" style=
-=3D"width: 48px;max-width: 48px;display: block;border: 0;height: auto;outli=
-ne: none;text-decoration: none;-ms-interpolation-mode: bicubic;" width=3D"4=
-8"></a>
-                                                    </td>
-                                                </tr>
-
-
-                                            </tbody></table>
-
-
-                                        <!--[if mso]>
-                                        </td>
-                                        <![endif]-->
-
-                                    <!--[if mso]>
-                                    </tr>
-                                    </table>
-                                    <![endif]-->
-                                </td>
-                            </tr>
-                        </tbody></table>
-                    </td>
-                </tr>
-            </tbody></table>
-        </td>
-    </tr>
-</tbody></table>
-
-            </td>
-        </tr>
-    </tbody>
-</table></td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END BODY -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align=3D"center" valign=3D"top" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!-- BEGIN COLUMNS // -->
-                                    <table border=3D"0" cellpadding=3D"0" c=
-ellspacing=3D"0" width=3D"100%" id=3D"templateColumns" style=3D"border-coll=
-apse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-ad=
-just: 100%;-webkit-text-size-adjust: 100%;background-color: #FFFFFF;border-=
-top: 0;border-bottom: 0;">
-                                        <tr>
-                                            <td align=3D"center" valign=3D"=
-top" style=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-web=
-kit-text-size-adjust: 100%;">
-                                                <table border=3D"0" cellpad=
-ding=3D"0" cellspacing=3D"0" width=3D"600" class=3D"templateContainer" styl=
-e=3D"border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;=
--ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                                    <tr>
-                                                        <td align=3D"left" =
-valign=3D"top" class=3D"columnsContainer" width=3D"50%" style=3D"mso-line-h=
-eight-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 10=
-0%;">
-                                                            <table align=3D=
-"left" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%" clas=
-s=3D"templateColumn" style=3D"border-collapse: collapse;mso-table-lspace: 0=
-pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjus=
-t: 100%;">
-                                                                <tr>
-                                                                    <td val=
-ign=3D"top" class=3D"leftColumnContainer" style=3D"mso-line-height-rule: ex=
-actly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"></td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                        <td align=3D"left" =
-valign=3D"top" class=3D"columnsContainer" width=3D"50%" style=3D"mso-line-h=
-eight-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 10=
-0%;">
-                                                            <table align=3D=
-"right" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%" cla=
-ss=3D"templateColumn" style=3D"border-collapse: collapse;mso-table-lspace: =
-0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adju=
-st: 100%;">
-                                                                <tr>
-                                                                    <td val=
-ign=3D"top" class=3D"rightColumnContainer" style=3D"mso-line-height-rule: e=
-xactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;"></td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END COLUMNS -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align=3D"center" valign=3D"top" style=
-=3D"mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-s=
-ize-adjust: 100%;">
-                                    <!-- BEGIN FOOTER // -->
-                                    <table border=3D"0" cellpadding=3D"0" c=
-ellspacing=3D"0" width=3D"600" id=3D"templateFooter" style=3D"border-collap=
-se: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adju=
-st: 100%;-webkit-text-size-adjust: 100%;background-color: #ECEAD4;border-to=
-p: 0;border-bottom: 0;">
-                                        <tr>
-                                            <td valign=3D"top" class=3D"foo=
-terContainer" style=3D"padding-top: 9px;padding-bottom: 9px;mso-line-height=
--rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">=
-<table class=3D"mcnTextBlock" style=3D"min-width: 100%;border-collapse: col=
-lapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100=
-%;-webkit-text-size-adjust: 100%;" border=3D"0" cellpadding=3D"0" cellspaci=
-ng=3D"0" width=3D"100%">
-    <tbody class=3D"mcnTextBlockOuter">
-        <tr>
-            <td class=3D"mcnTextBlockInner" valign=3D"top" style=3D"mso-lin=
-e-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust:=
- 100%;">
-
-                <table style=3D"min-width: 100%;border-collapse: collapse;m=
-so-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webk=
-it-text-size-adjust: 100%;" class=3D"mcnTextContentContainer" border=3D"0" =
-cellpadding=3D"0" cellspacing=3D"0" align=3D"left" width=3D"100%">
-                    <tbody><tr>
-
-                        <td class=3D"mcnTextContent" style=3D"padding-top: =
-9px;padding-right: 18px;padding-bottom: 9px;padding-left: 18px;mso-line-hei=
-ght-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%=
-;word-break: break-word;color: #202020;font-family: Verdana;font-size: 10px=
-;line-height: 125%;text-align: center;" valign=3D"top">
-
-                            <em>Copyright =C2=A9 2017 *|LIST:COMPANY|*, All=
- rights reserved.</em><br>
- *|LIST:DESCRIPTION|*<br>
-<br>
-<strong>Our mailing address is:</strong><br>
-*|HTML:LIST_ADDRESS_HTML|* <br>
-<br>
-Want to change how you receive these emails?<br>
-You can <a href=3D"*|UPDATE_PROFILE|*" style=3D"mso-line-height-rule: exact=
-ly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #C52E26=
-;font-weight: bold;text-decoration: none;">update your preferences</a> or <=
-a href=3D"*|UNSUB|*" style=3D"mso-line-height-rule: exactly;-ms-text-size-a=
-djust: 100%;-webkit-text-size-adjust: 100%;color: #C52E26;font-weight: bold=
-;text-decoration: none;">unsubscribe from this list</a><br>
-<br>
-
-                        </td>
-                    </tr>
-                </tbody></table>
-
-            </td>
-        </tr>
-    </tbody>
-</table></td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END FOOTER -->
-                                </td>
-                            </tr>
-                        </table>
-                        <!-- // END TEMPLATE -->
-                    </td>
-                </tr>
-            </table>
-        </center>
-    </body>
-</html>
-
---_av-17eAoYMNNKEIcqCToyLXBA--
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/ics_in_header.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/ics_in_header.eml
deleted file mode 100644
index 76ca1b779e3..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/ics_in_header.eml
+++ /dev/null
@@ -1,46 +0,0 @@
-MIME-Version: 1.0
-Content-Type: multipart/mixed; 
-	boundary="----=_Part_80_888179120.1536742699653"
-From: Alice <alice@linagora.com>
-Message-ID: <82eb227b-d3e1-3d7a-3220-8a1b4e96a85b@linagora.com>
-To: Bob <bob@linagora.com>
-Date: Wed, 12 Sep 2018 10:58:18 +0200
-Subject: Event Invitation Reply (Accepted):
- Point Produit
-
-------=_Part_80_888179120.1536742699653
-BEGIN:VCALENDAR
-PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-CREATED:20180911T144134Z
-LAST-MODIFIED:20180912T085818Z
-DTSTAMP:20180912T085818Z
-UID:f1514f44bf39311568d64072945fc3b2973debebb0d550e8c841f3f0604b2481e047fe
- b2aab16e43439a608f28671ab7c10e754cbbe63441a01ba232a553df751eb0931728d67672
- 
-SUMMARY:Point Produit
-PRIORITY:5
-ORGANIZER;CN=Bob;X-OBM-ID=348:mailto:bob@linagora.com
-ATTENDEE;CN=Alice;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL;X-OBM-ID=810:
- mailto:alice@linagora.com
-DTSTART:20180919T123000Z
-DURATION:PT1H
-TRANSP:OPAQUE
-SEQUENCE:0
-X-LIC-ERROR;X-LIC-ERRORTYPE=VALUE-PARSE-ERROR:No value for X property. Rem
- oving entire property:
-CLASS:PUBLIC
-X-OBM-DOMAIN:linagora.com
-X-OBM-DOMAIN-UUID:02874f7c-d10e-102f-acda-0015176f7922
-LOCATION:Téléphone
-END:VEVENT
-END:VCALENDAR
-Content-class: urn:content-classes:calendarmessage
-Content-type: text/calendar; method=REPLY; charset=UTF-8
-Content-transfer-encoding: 8BIT
-Content-Disposition: attachment
-
-
-------=_Part_80_888179120.1536742699653--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedMultipart.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedMultipart.eml
deleted file mode 100644
index d9fc2bf81ea..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedMultipart.eml
+++ /dev/null
@@ -1,36 +0,0 @@
-Return-Path: <returnPath>
-Received: from localhost (localhost [127.0.0.1])
-	by localhost (Postfix) with ESMTP id 27358B3A09;
-	Tue, 11 Oct 2016 11:59:12 +0200 (CEST)
-Date: Tue, 11 Oct 2016 02:59:07 -0700
-From: you@apache.org
-To: me@apache.org
-Message-ID: messageId
-Subject: Confirm your email address
-MIME-Version: 1.0
-Content-Type: multipart/mixed; 
-	boundary="----=_Part_5211_53602129.1476179947600"
-Content-Disposition: inline
-
-------=_Part_5211_53602129.1476179947600
-Content-Type: multipart/alternative; 
-	boundary="----=_Part_5210_1271316664.1476179947600"
-
-------=_Part_5210_1271316664.1476179947600
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-Hello text body
-
-------=_Part_5210_1271316664.1476179947600
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-<html>Hello html body</html>
-
-------=_Part_5210_1271316664.1476179947600--
-
-------=_Part_5211_53602129.1476179947600--
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentDisposition.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentDisposition.eml
deleted file mode 100644
index a3713d6ee4e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentDisposition.eml
+++ /dev/null
@@ -1,69 +0,0 @@
-FCC: imap://user@localhost.com/Sent
-X-Identity-Key: id6
-X-Account-Key: account7
-Subject: Re: Excuse pour vendredi dernier
-To: To User <to@localhost.com>
-From: From User <from@localhost.com>
-X-Enigmail-Draft-Status: N1110
-Message-ID: <55AE39CD.8050802>
-Date: Tue, 21 Jul 2015 14:23:41 +0200
-X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0;
- attachmentreminder=0
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
- Thunderbird/38.1.0
-MIME-Version: 1.0
-In-Reply-To: <dcc6e01637bbd527c411f34de96e6326>
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="09AtNRN8t1bkTL9UtJde8HAiXSJ7dIX0X"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---09AtNRN8t1bkTL9UtJde8HAiXSJ7dIX0X
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---09AtNRN8t1bkTL9UtJde8HAiXSJ7dIX0X
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMA047f/J68U5CAQf/XXJE8zpJa23r5HqXHRlWHIEQIYGebfzpa1KRy5nx6EB8
-Ku8K0UBIpIK9bxuYV1529jAWfx3iK7M5ekMrAobjbbE0ANB3MfEJX+SAl2m/pNY6
-RM7RoyVkYjzyaKXFshxRIxTIDXxq/YqeIre2yFSSnUYkM9k8mJZkt+f9KAm1CZ28
-YF7oE/+8JmsLBEkNnblb+3c8UiqQLGOywnIVlcv017+e175bq739fJaZgcugHKK5
-l4U7TIFXGHrR5OQO/ec52PZuVAGn4tFEza7ddVd4kdpW37d9DBgLEmUh1aZls0wY
-F6MzvsyUqvw9S1V/B6h8pIvDsfwQL04bGaaXnm5/9dLqAU8P4g8jVlgSdDPEvH7/
-WB1lZABZXgEUEE29/NXQNHYka2Ael4tK6dfDxikrHrsTK5NJUCptXLkaBKnd8+l9
-nKhkUoaJTpXFxuKRYNVDHhJLKGD8klLEsM8AKwk4wEDjJ2SqtdmEGgpGLq1Tje9d
-Ckb9W5NNaZJ0g5lyxtH3YbFNGs9YTP5D8WQ7k8TUxYrvgHiXRROKQwUDAVHIkLnm
-8AJcBwmFFbWSfok5JL1p91jSaYCe7vbqFsggbFO6/uRtSP+U80ZIsbtg+8jhY8x/
-2LAOD/UQopJV3ulIyWDeRmYjP4tiP2JJRuXoG9mYmnMnpBNulEqk0PCgoh9WTw+w
-dPQEHm9DnENCD5r4oBgHXizS14NlL4JbikQjpRhZSB+AZsT7Z2MczDWZ36T8k3cb
-o2ec7HjL4PNaNSpcHTXuuFoCtaKBw0C3oZVJIbSkjHKv80SD8B2+kZ3+uZSWqy6Q
-2t36KJuFwQFqvKeaw69XWjVrPEpkgR8YA7CVjUibYi5q4C81RF5wNIUMzjNO7BNu
-pMYI0w0Gvbmv7O/ekeuaRsClFJTMLxNKaTj1W/Ujeetnww6Ak0xbFSJHRVaR0m4y
-8m7vixRsC2RHI4XHddIdn7nkGE8Y28gRsUj3iH8fzJY1hD87DV1+pNjl3uVUWRm6
-yYrnlO7WVTpofHYWh5zQ5AEb7Y4kL30cvaCkBGYZs2hrXV7gtvpYZDIh4/w6fCtb
-9bY/fOTxeOeFvNFoKOmIfbeV9I3jn1fcMTWd1euyr6CvlZZw8s5+IaHY/x+QEI5w
-npb9RuENgY1dsI+SH6SlpFjl3m+3DwI9o9GiyLmub3cGBucPfOUfAnFLJ+/HMJHc
-WieveXLbqBnxrUMZ3VJVBU88QNMTD77Uyou2HAS2xbRVFAeIuIO6UE01f7CChY6X
-3KU+DYzbtY+zFNGBgR3dI+lraxIEXFD3EKRilLiSpI9ZrCNa15LVigiz7xzHWkKK
-16ZPZcvsMGvZSlXSw7JW2s9AixFxcm2uoQy4WgFMG2i89vkkln50cGx6VAdeAv+N
-uUqgFmvS9uaH36kIFUl2YOsjEMd37CbT7U1rqcOTDtOyTQ468UGtf31EUOwiLOQL
-/zVqk2qIKBgj723d585MCVI3uNrM2PkpETe8I0mIdUyPPAOIklVAdHaBRs956jzQ
-yUFFJk8iM4cGBJXgGLOxvvQPCxD06mulCYFqybgE0XqSu/K/lCALclSecxpoote4
-fHKS7UYlHcNfJ6W7z5BLVypUBATIdAn/Ea30f4EbkyqC/jlT7dhlVzYzeAWgJFs8
-F55FKPblV561TDZx4KrrL4Ya8QHHLPK4c4+z4NWJvlWStUrliWV4s1lHqg/8x1sU
-Hax5xAP2edb6LwKzmCs+CqYVL2IM0bPHCUikjAc9yEPU7C4a3ldk/kb9V4Y9N8Xl
-oANzbohWTTiQtqEKM0Q3kbxRJs6xGRhsUlE44OPkG8WcA+diadJIK7oGAkBHPHjY
-K/m92sPDptGdDvqCoXATyOQNwymBSQ5u9hQ8SHP9xwq/MAVrsZ8Zr9A4EhEtx5Dg
-AXkpM+PVXKS7FJEWA/T1clOBYZtj2rVwomL9yXJ2
-=4I6B
------END PGP MESSAGE-----
-
---09AtNRN8t1bkTL9UtJde8HAiXSJ7dIX0X--
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentID.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentID.eml
deleted file mode 100644
index 6ea2375d0fc..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/inlinedWithoutContentID.eml
+++ /dev/null
@@ -1,60 +0,0 @@
-Return-Path: <user@localhost.com>
-Received: from localhost
-X-Sieve: CMU Sieve 2.4
-X-Virus-Scanned: Debian amavisd-new at localhost.com
-X-Spam-Flag: NO
-X-Spam-Score: -1.289
-X-Spam-Level:
-Content-Type: multipart/mixed; boundary=Apple-Mail-E1D6D861-D1AD-47F9-A403-F2AA32CC52CC
-Content-Transfer-Encoding: 7bit
-From: Sender <from@localhost.com>
-Mime-Version: 1.0 (1.0)
-Date: Mon, 11 Dec 2017 22:06:42 +0100
-Subject: Inlined Photos
-Message-Id: <sendId@localhost.com>
-X-Mailer: iPhone Mail (14G60)
-
-
---Apple-Mail-E1D6D861-D1AD-47F9-A403-F2AA32CC52CC
-Content-Type: text/plain;
-	charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-
-
-
---Apple-Mail-E1D6D861-D1AD-47F9-A403-F2AA32CC52CC
-Content-Type: image/jpeg;
-	name=IMG_6112.JPG;
-	x-apple-part-url=B11616AF-86EB-47AF-863A-176A823498DB
-Content-Disposition: inline;
-	filename=IMG_6112.JPG
-Content-Transfer-Encoding: base64
-
-/9j/4QZIRXhpZgAATU0AKgAAAAgACgEPAAIAAAAGAAAAhgEQAAIAAAAJAAAAjAESAAMAAAABAAYA
-AAEaAAUAAAABAAAAlgEbAAUAAAABAAAAngEoAAMAAAABAAIAAAExAAIAAAAHAAAApgEyAAIAAAAU
-AAAArgITAAMAAAABAAEAAIdpAAQAAAABAAAAwgAAAABBcHBsZQBpUGhvbmUgNgAAAAAASAAAAAEA
-AABIAAAAATEwLjMuMwAAMjAxNzoxMjoxMSAxODowNjoyMAAAIIKaAAUAAAABAAACSIKdAAUAAAAB
-AAACUIgiAAMAAAABAAIAAIgnAAMAAAABAPoAAJAAAAcAAAAEMDIyMZADAAIAAAAUAAACWJAEAAIA
-AAAUAAACbJEBAAcAAAAEAQIDAJIBAAoAAAABAAACgJICAAUAAAABAAACiJIDAAoAAAABAAACkJIE
-AAoAAAABAAACmJIHAAMAAAABAAUAAJIJAAMAAAABABgAAJIKAAUAAAABAAACoJIUAAMAAAAEAAAC
-qJJ8AAcAAANGAAACsJKRAAIAAAAEOTExAJKSAAIAAAAEOTExAKAAAAcAAAAEMDEwMKABAAMAAAAB
-AAEAAKACAAQAAAABAAAMwKADAAQAAAABAAAJkKIXAAMAAAABAAIAAKMBAAcAAAABAQAAAKQCAAMA
-AAABAAAAAKQDAAMAAAABAAAAAKQFAAMAAAABAB0AAKQGAAMAAAABAAAAAKQyAAUAAAAEAAAF9qQz
-AAIAAAAGAAAGFqQ0AAIAAAAiAAAGHAAAAAAAAAABAAAAIQAAAAsAAAAFMjAxNzoxMjoxMSAxODow
-NjoyMAAyMDE3OjEyOjExIDE4OjA2OjIwAAAAAP0AAAAyAAAe1AAADY0AABEhAAAItAAAAAAAAAAB
-AAAAUwAAABQGXwTHBwMENUFwcGxlIGlPUwAAAU1NAAsAAQAJAAAAAQAAAAUAAgAHAAACLgAAAJgA
-AwAHAAAAaAAAAsYABAAJAAAAAQAAAAEABQAJAAAAAQAAAO8ABgAJAAAAAQAAAQIABwAJAAAAAQAA
-AAEACAAKAAAAAwAAAy4ACQAJAAAAAQAAARMADgAJAAAAAQAAAAAAFAAJAAAAAQAAAAQAAAAAYnBs
-aXN0MDBPEQIAXABhAG8AHwFaAUUBOAEfAQUB/gCJAZUBnQGxAcEByAFgAJUAVgFcATEBKAE/AVgB
-dwFtAXsBqgGsAbABtAG8AXwAUwEdAe0A5gCyAIAAbACQAOwAdwGuAcUBrQGlAbMBFwE5ARwB6gCf
-ABIAEwATAA8AJQBrADwBqwHAAawBpAFrAVwBVAHzAD8AHAAhABYAEgARACQAyAD3AJkBrAGdARkB
-JwELAQYBMAAYACkAGAAaACMADwB7ANoANQGvAZUBYgEkAUgBWQF3ABMANABWALkAKgH1ANQA7gAy
-VNRXU//Z
---Apple-Mail-E1D6D861-D1AD-47F9-A403-F2AA32CC52CC
-Content-Type: text/plain;
-	charset=us-ascii
-Content-Transfer-Encoding: 7bit
---
-Sender
---Apple-Mail-E1D6D861-D1AD-47F9-A403-F2AA32CC52CC--
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/longLine.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/longLine.eml
deleted file mode 100644
index 84b285e789e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/longLine.eml
+++ /dev/null
@@ -1 +0,0 @@
-01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentAndBlankCid.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentAndBlankCid.eml
deleted file mode 100644
index 39facf2e7b2..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentAndBlankCid.eml
+++ /dev/null
@@ -1,74 +0,0 @@
-Return-Path: <sender@gmail.com>
-MIME-Version: 1.0
-Delivered-To: test@localhost
-Received: from localhost
-X-Virus-Scanned: Debian
-X-Spam-Flag: NO
-X-Spam-Score: -1.78
-X-Spam-Level:
-X-Spam-Status: No, score=-1.78 tagged_above=-99 required=2
-	tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, FREEMAIL_FROM=0.001,
-	RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_DKIM_INVALID=0.01,
-	T_FREEMAIL_DOC_PDF=0.01] autolearn=no
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=from:mime-version:subject:message-id:date:cc:to;
-        bh=lgK1xUjmh9FzAPFKLN2lvhSSlfI6ujj8K57kqImKrA8=;
-        b=tw7ave7egTqm3ZcXDe0NeuPSli3nkOBuqjOWLaK0MivSzO8FTQEWzCMEAlyhG4PMcP
-         jkxmhKAAjNPshiFnAYzPB4LNQV6GKPNUQ5igA9HDzh4dfbdT/6GiTEvUyWKZ6VpGVASR
-         x9Ioyiwxrdf4phsMYSHT7/Y+94/SvmAQj5gZZXfQ8JvmIAlxN9F4mvMnk2JQM4wcGv8Z
-         15zNoTxcUPODEybnawotJUewQu2sCKL7S46vFfKiuYEiKPC/XhGPFsjvwBAvcMBfRgbm
-         jJSAPk0TlXERVjhd3CSCHC1ukQ1nICb3yTZacuOK0gUgJ7rKY25zQoq2QvYgX97SuThz
-         BpHw==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:from:mime-version:subject:message-id:date:cc:to;
-        bh=lgK1xUjmh9FzAPFKLN2lvhSSlfI6ujj8K57kqImKrA8=;
-        b=VmTt7K8LRHq/MdOYtIhRnA/Lkbx41VnZh6+SYior8s5kLaKgrJWi+N/ql7SU6lCR2m
-         JFTyvIfUqsNFiHy0wPMlI4RauXHNVQWe9C+UQ5hc5BT+Z67O/5dxe+KDhtchRqh7JWC5
-         aWDjuvROFqhEEqphuEtGLqEqnHPbmweMZBIouasP2Z0TiHTSASSJq60HUcwf7UcVbmbw
-         m5O35XykCkecEX+H9fGAqgzlvFvtfy4PDENWfz8Yhzv730FsAmDutRjww0HYriyLwgpN
-         OjrT1o6p6DrWs5JlcgRh7F5qauiR/WTq+srbWbe/tLD7Lx8WRKyeXuzjKyTKJ5TjV6c5
-         AHKA==
-X-Gm-Message-State: AFeK/H1blcvejtSjL0KgKvb81Bc5uVOYQpq8wm/HouMZgtBr1kw+d9+VOes+FQrObRJdbQ==
-X-Received: by 10.28.133.84 with SMTP id h81mr8649035wmd.23.1489999897292;
-        Mon, 20 Mar 2017 01:51:37 -0700 (PDT)
-From: <from@localhost>
-Content-Type: multipart/mixed;
- boundary="Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4"
-Subject: mail with attachment from apple mail
-Message-Id: <153836C4-4563-400A-ACBF-E2E2ED0FBB49@gmail.com>
-Date: Mon, 20 Mar 2017 09:51:28 +0100
-To: <to@localhost>
-X-Mailer: Apple Mail (2.3259)
-
-
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain;
-	charset=utf-8
-
-Voil=C3=A0
-
---=20
-Voila=
-
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4
-Content-Disposition: inline;
-	filename=deromaCollection-628.pdf
-Content-ID:
-Content-Type: application/pdf;
-	x-unix-mode=0644;
-	name="deromaCollection-628.pdf"
-Content-ID: <   >
-Content-Transfer-Encoding: base64
-
-JVBERi0xLjQKJeLjz9MKMSAwIG9iaiAKPDwvVHlwZSAvQ2F0YWxvZyAvVmVyc2lvbiAvMS40IC9Q
-YWdlcyAyIDAgUiAvTmFtZXMgNiAwIFIgPj4KZW5kb2JqCjIgMCBvYmogCjw8L1R5cGUgL1BhZ2Vz
-IC9LaWRzIFsxMCAwIFIgMTIgMCBSIDE5IDAgUiBdIC9Db3VudCAzID4+CmVuZG9iagozIDAgb2Jq
-IAo8PC9UaXRsZSAo/v8AVADpAG4A6QByAOkpIC9BdXRob3IgKERlcm9tYSBTcGEpIC9TdWJqZWN0
-ICj+/wBDAG8AbABsAGUAYwB0AGkAbwBuACAAVADpAG4A6QByAOkpIC9LZXl3b3JkcyAo/v8ARABl
-AHMALABwAGkA6ABjAGUAcwAsAHUAbgBpAHEAdQBlAHMALAAsAGMAcgDpAOkAZQBzACwAcABhAHIA
-LABkAGUALAB0AGEAbABlAG4AdAB1AGUAdQB4ACwAYQByAHQAaQBzAGEAbgBzACwAcABvAHQAaQBl
-bmZvIDMgMCBSID4+CnN0YXJ0eHJlZgoyOTQ0MDcKJSVFT0YK
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentButNoCid.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentButNoCid.eml
deleted file mode 100644
index de13d72d0a6..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithInlinedAttachmentButNoCid.eml
+++ /dev/null
@@ -1,72 +0,0 @@
-Return-Path: <sender@gmail.com>
-MIME-Version: 1.0
-Delivered-To: test@localhost
-Received: from localhost
-X-Virus-Scanned: Debian
-X-Spam-Flag: NO
-X-Spam-Score: -1.78
-X-Spam-Level:
-X-Spam-Status: No, score=-1.78 tagged_above=-99 required=2
-	tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, FREEMAIL_FROM=0.001,
-	RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_DKIM_INVALID=0.01,
-	T_FREEMAIL_DOC_PDF=0.01] autolearn=no
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=from:mime-version:subject:message-id:date:cc:to;
-        bh=lgK1xUjmh9FzAPFKLN2lvhSSlfI6ujj8K57kqImKrA8=;
-        b=tw7ave7egTqm3ZcXDe0NeuPSli3nkOBuqjOWLaK0MivSzO8FTQEWzCMEAlyhG4PMcP
-         jkxmhKAAjNPshiFnAYzPB4LNQV6GKPNUQ5igA9HDzh4dfbdT/6GiTEvUyWKZ6VpGVASR
-         x9Ioyiwxrdf4phsMYSHT7/Y+94/SvmAQj5gZZXfQ8JvmIAlxN9F4mvMnk2JQM4wcGv8Z
-         15zNoTxcUPODEybnawotJUewQu2sCKL7S46vFfKiuYEiKPC/XhGPFsjvwBAvcMBfRgbm
-         jJSAPk0TlXERVjhd3CSCHC1ukQ1nICb3yTZacuOK0gUgJ7rKY25zQoq2QvYgX97SuThz
-         BpHw==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:from:mime-version:subject:message-id:date:cc:to;
-        bh=lgK1xUjmh9FzAPFKLN2lvhSSlfI6ujj8K57kqImKrA8=;
-        b=VmTt7K8LRHq/MdOYtIhRnA/Lkbx41VnZh6+SYior8s5kLaKgrJWi+N/ql7SU6lCR2m
-         JFTyvIfUqsNFiHy0wPMlI4RauXHNVQWe9C+UQ5hc5BT+Z67O/5dxe+KDhtchRqh7JWC5
-         aWDjuvROFqhEEqphuEtGLqEqnHPbmweMZBIouasP2Z0TiHTSASSJq60HUcwf7UcVbmbw
-         m5O35XykCkecEX+H9fGAqgzlvFvtfy4PDENWfz8Yhzv730FsAmDutRjww0HYriyLwgpN
-         OjrT1o6p6DrWs5JlcgRh7F5qauiR/WTq+srbWbe/tLD7Lx8WRKyeXuzjKyTKJ5TjV6c5
-         AHKA==
-X-Gm-Message-State: AFeK/H1blcvejtSjL0KgKvb81Bc5uVOYQpq8wm/HouMZgtBr1kw+d9+VOes+FQrObRJdbQ==
-X-Received: by 10.28.133.84 with SMTP id h81mr8649035wmd.23.1489999897292;
-        Mon, 20 Mar 2017 01:51:37 -0700 (PDT)
-From: <from@localhost>
-Content-Type: multipart/mixed;
- boundary="Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4"
-Subject: mail with attachment from apple mail
-Message-Id: <153836C4-4563-400A-ACBF-E2E2ED0FBB49@gmail.com>
-Date: Mon, 20 Mar 2017 09:51:28 +0100
-To: <to@localhost>
-X-Mailer: Apple Mail (2.3259)
-
-
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain;
-	charset=utf-8
-
-Voil=C3=A0
-
---=20
-Voila=
-
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4
-Content-Disposition: inline;
-	filename=deromaCollection-628.pdf
-Content-Type: application/pdf;
-	x-unix-mode=0644;
-	name="deromaCollection-628.pdf"
-Content-Transfer-Encoding: base64
-
-JVBERi0xLjQKJeLjz9MKMSAwIG9iaiAKPDwvVHlwZSAvQ2F0YWxvZyAvVmVyc2lvbiAvMS40IC9Q
-YWdlcyAyIDAgUiAvTmFtZXMgNiAwIFIgPj4KZW5kb2JqCjIgMCBvYmogCjw8L1R5cGUgL1BhZ2Vz
-IC9LaWRzIFsxMCAwIFIgMTIgMCBSIDE5IDAgUiBdIC9Db3VudCAzID4+CmVuZG9iagozIDAgb2Jq
-IAo8PC9UaXRsZSAo/v8AVADpAG4A6QByAOkpIC9BdXRob3IgKERlcm9tYSBTcGEpIC9TdWJqZWN0
-ICj+/wBDAG8AbABsAGUAYwB0AGkAbwBuACAAVADpAG4A6QByAOkpIC9LZXl3b3JkcyAo/v8ARABl
-AHMALABwAGkA6ABjAGUAcwAsAHUAbgBpAHEAdQBlAHMALAAsAGMAcgDpAOkAZQBzACwAcABhAHIA
-LABkAGUALAB0AGEAbABlAG4AdAB1AGUAdQB4ACwAYQByAHQAaQBzAGEAbgBzACwAcABvAHQAaQBl
-bmZvIDMgMCBSID4+CnN0YXJ0eHJlZgoyOTQ0MDcKJSVFT0YK
---Apple-Mail=_DF3869A6-784C-445C-8AA0-EBEFE28034A4--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithRecipients.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithRecipients.eml
deleted file mode 100755
index 292033bd31c..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/mailWithRecipients.eml
+++ /dev/null
@@ -1,14 +0,0 @@
-Content-Type: text/plain; Charset=UTF-8
-Date: Fri, 17 Sep 2010 17:12:26 +0200
-Subject: my subject
-To: to <to@james.org>
-Cc: cc@james.org
-Bcc: bcc@james.org
-MIME-Version: 1.0
-Message-Id: <20100917151246.2A9384BA1@lenny>
-From: From <from@james.org>
-
-Mail content
-
--- 
-Ad Min
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/multipartRelated.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/multipartRelated.eml
deleted file mode 100644
index df4e3661d66..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/multipartRelated.eml
+++ /dev/null
@@ -1,38 +0,0 @@
-Return-Path: <linshare-noreply@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-     by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-     Mon, 22 Aug 2016 14:06:47 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from linshare1.linagora.dc1 (linshare1.linagora.dc1 [172.16.18.60])
-    by alderaan.linagora.com (Postfix) with ESMTP id 36470776
-    for <ddolcimascolo@linagora.com>; Mon, 22 Aug 2016 14:06:47 +0200 (CEST)
-Date: Mon, 22 Aug 2016 14:06:47 +0200 (CEST)
-From: LinShare <linshare-noreply@linagora.com>
-Reply-To: abenchi@linagora.com
-To: ddolcimascolo@linagora.com
-Message-ID: <2020561626.8931471867607210.JavaMail.tomcat7@linshare1>
-Subject: A user Abdulkader BENCHI has just made a file available to you!
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-    boundary="----=_Part_1786_771314706.1471867607209"
-
-------=_Part_1786_771314706.1471867607209
-Content-Type: multipart/related; 
-    boundary="----=_Part_1787_1274970450.1471867607209"
-
-------=_Part_1787_1274970450.1471867607209
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<html>multipart/related content</html>
-
-------=_Part_1787_1274970450.1471867607209
-Content-Type: image/png; name=gimp.png
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename=gimp.png
-Content-ID: <image.part.1@linshare.org>
-
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAALxklEQVR4Ae2Xe0xUZ97H5X4RiyAXEARURBSYCzNnLjMwwAx3huGOIBcUFJERAUVRq+KlwHABFdu+b9+0766x1W21ttnUtE3rul6aGNtm3XbdWncjaa3VXrZRK6IgfPd3Tp6wOGmyo0v/cOMknxwy5xzO7/P8LueZaWlpaU80TwWeCvy3CcRwXJlUqp39RApIOE4i5hQPxBz30hMpIJIrjktkseMimfzPUyoglilTf/XVl8u1Ik4xrOJEEMu4wSkVEMmVZ6VSTeivFXy0TDZfIlfc0qil0KpIQM59P6UCUk71lVShPD1t2jT7qQ4+Sq32prq/GhfHjSXFSxGvEfMCQ1MsoLzOadT3pArFwBQ3LSdRqK4mJyfcz0xRwaCLRVKcBDEybmxqBRTKH8uXpEOj0/1MD3wuMTHR8T9adY4LoOD3KuPj7xYVGlGYo0e6gUNKoowkpKBmHpXJZO5TKXCrpjwT5pWFSM1IvROrVH0hksujf+laAHYWi8XT+nsKyIlvVKlSeVSu0twtXpI/Yq4rR2lBKoxpamQmK5Gm55CcIAP1wxAvOWUCEk4xVLvchIaVedi8rgq1NSXjqnjdHcrGayK5yhStVPpbLLvE/Xt6Tnf3Wu529XSM9fZ13Wzbse2kJiGhK1ap/ETCqe5lGLNum+trxnZsbca6tcuwJM+AvKw4mNI1yEpVURYUSE2S8wJ3RSKN35QJUJPdM6/IQ8vaCmzdZMbObU2w7G7BhhbzeEFR4e2SsrIRChqnz5zE999/h9HREXz19SDefOt1dPW0Y8e2Frywtx0vDnRg57NrUVdTgJJ8PYpyEpBvjEdOhvahLIg55YOioiKHRxKgjwPBEaHEQzfz/3DH9mb07+nGsbeO4MjRw+jts8DS3or/GdiNnr4ufP6XC/jhh+9w587PuHdvGLdv38SNG9fwwYfvon9vN3Zvb0Td8lxUlqSirCgZpSRQnJuIgmwdcikL2elqZKUwAbni0aaQvb19M3HT2dnlloODw5Cdnd0d+rKVRFz48xkm0+i+gX5cv34NP/30I86fP4ePPjqL3n4LOjq24O2338CVK1/i22+v4ssvL+HTTz+B2WzGqlUrcfr0HzCwvw9Na8pRXZaBqtI0VBSnYGmBgUooEYUmHYQyyhDKCClJCl7gus0C9DE5OjkNpefkoXvPPugzjIiMEcN9+vQ7JHKFzvs1tzTdO3P2lBD8wYMHce3aNVBTYk1DPXp62/HHUx/g0qXPSOIyBgcHwX/u37+PiMhIiCViHP7dAbRuqAc/CJbxAktIoJAXSEKRiZURCRhJwJCoAPXcRZsF7B0dL8cq1RgeHgb/+fziX6E1pPCjDJ5e3iOUmcHWzRvHz398ThAoKSnB5b/9HYbUdMwJmUPl04GTJ9/DhQvn8cYbh/D++++D/1y/cYOvZbi6uWHvvj48u7kRgsDSdEGgjARKSOChPiCBpAQFpBx3ymYBWuXR9Zu2gH0wPj6O7KISyNRxiBJLMeMZz/GcXOP4a4cOCAJ5eXmY5eMDL29v6PUJ6O7aQX1xGOfOncLx429h5syZMDc2I05vQJQ0Fq6uriTZifWNy60yYCXAMqDVcmMiTtlrswAZPMgtLsXY2Jgg8PXVb5CYngWpSoMFi6MRsTAS7rSKnZZdeP3IIarv89ixow21tTXoaN9KE6kefdQLJ04cx5kzH0Cp5OA9axYCgoIx08sLCQlxsHS3o646F9XlGSQwuQeSJveAICBTKm49yuaRb+Drco0W6zdTM75zHJW1dVAlGvjXOULDF2ABCQQFz4FcEomdbc3o7qGpQ+za3oQtzWXY3LwUHc9twfPP9+Gd40ephN5GW9tmJCXpsHnLBrq+HS1N1VhRkYnlZemooilUzk+hgokpNPEuyExWUdlx99lb2GaBV+eGh48kJKciVq0VSofqX1j9wDkhCA4Ng0gihb+vF5pXF2K9uQgta4qxoWEJNq4l6LihoQRtW5vQRSu9d6AH//vSAI1cCzq7dmNdQxVWVmahhq3+RP3n/6t8cjO1yE5TQ59EDaxQsN8Ctk+hUH50JhqSESONFQKfF0GrToH7+AfAf3YQdIlJcHNzwdrafDTWFaCJRJqJdfVFAvzfTfR9c30xrfYytLbUotlchtXVOULwND6FICuXPLz61uWj1iruUePv4gvbZgGWhv2+fn5DesrCXCob34BAPniBoJBQJOj18KMM1NfkYM2KXGFL0VCbxwsJ0N/Cd2Y6x1+zmrYdq5YZJ1Z+OU2ejGTK6rwg4QX20Phkq59mUPLz/264SBRMAva2Sky8hWka/T4gMPBuVnY2OJUaIXPnYU7YXCQlJ0MsFkMaE05BZdPbNJtW1iRQTytMCH9T0MK5VVVC4ELN8ytPZSNsG6IjQ5C4wAkVWl+UZsYiP1sonYl9kIpWPzpW9gLFMp1wJhyYhM1bCUfqh5dp7A3J5PIHqWnpyDQaIZFKMMvbU3iD0hikwLKEAGt5KFhCWGUKlk2ZdGGrUEQlkqaXC+LBgV4ok7tik8Edr1fOwKbkGajXeaBcH4aclFik6hXC9sE7ICCK4vAhZhAutkj8UlMsopL6jZ2d/acOjo7fBAbPuW/Qax7QHkYoBZIQgqUjQ5guQm3nG3VCqeg0IsSKFmDRwlBERYZBHDUPxvhICvoZdGR54IudEfisg8Nva+aiQTcDpVq/B4qY8Ffo2QuIYCsJVk62C9gRTiyVPkFhYSqxnLuk0qqH83P0FGwmVi3PpbLJp2MeZSSbxGjlSa6yRJjxgsxSNmmWUCZo2gjjMj9LgwpDGMzxbji20h9Xu6JxpV+FI+aF4016z/u1atcPq/P1DTqdOoae7U24E46PI+DMVsCfCHN2do6OWBzdS9vqf3Bq1bAxM4FKJZMalqbQmkq00N6+eU0FGlaV0gurgErJiPLiNHpZJfN7fiqnJNawwrYZJoMYtfFeVErT8fG6WbjaGYHBPg6v1EWNdXa2Yeuz6w75+PgEshicHkfAhXiGCCDmEosJGaELCgnpiJJIByUK5YjBED++tDANtctoGq0uw4amGmxaX0vHFSRUhfqVJVhRlYeK0iwSSSaBeCoxJTQablwk40aTYvwvrta6DL9c7DF6eYsPeixtOPjqAbzw4v6hrp7OC+XV5QsfV8CJ2fsRIUQkISXURCpR6enl1b1g0eLP+d8KsQrlqEqjGtHr48ezMmhMFmWiqsyEylIjivNSKPBEJBu0UKoVD0Qy+djC6Oir7h4eA/R/mvw87FdXK13PbsyPHOnt7aAtyQmBQ4dfHe3p7by187ntOXTdPCKDcLZVwIFwI7yIQGLepCxomUQ50Ui0UTD/5+Pr925waOifFi6OuiaKlQ1JOOUYMU6CozGx8uHIqJjr/kFBJ11cXJ6ne7YSZmIpkUJoWxqXv2fp2n133/49d44de1OQOHr0CAIC/Meio6MhkUhA110jNhL21gLWEvaTGtmbmM0kFk3KRCKRRZQR9cQGoo3oIHppJPfTsY/oJtqJbUQLUUeUshVNIJSExMvLK9rT03P+upbGVd09nZfo9/XPJlM2/P390dnZKRAWFsZL8JT+OwG7SRLuxEzCn5VTOBHFRJREPKEn0ggTUcRWtoJRyr4zscwlEXHsXinLbDgbn37sWW7bdm2L9/Pzu+nu7o6NGzeitbWVshEAlokvCPsJARskXFlPeDORYJaRCCYjZuWlYNnREFqGhlCxczJ27WJ279xJgXsRHmyAOLJnnyTAQxkVjvPnz4evry94eWuBX5RgOEwSmU54ErOYzGxiDhHGpMKJCCvC2bkwFvBsFrQ3m3bTWeBO7Fl2jPUErKFy44/p1gK2ijgSzkzGnfBgQcxkAfkwfBk+DG9iJrvWg93ryoJ2nBy41bMPWQvQ7pk/LrMSeCQRe8JhkpATk3JhQblZ4crOOVsFLGwTrAOfDLv3AAErWq0FHldmktQEDlbYM+yseYTnLSOGCDD6H1/ARilrpuD/LyYuMoFDVgJPBqx3/p84YS3wpInonmQBxlOBpwJPBf4JszXhha5WvGwAAAAASUVORK5CYII=
-------=_Part_1787_1274970450.1471867607209--
-
-------=_Part_1786_771314706.1471867607209--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/noTextBodyButHtmlBody.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/noTextBodyButHtmlBody.eml
deleted file mode 100644
index 8a503c7fc81..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/noTextBodyButHtmlBody.eml
+++ /dev/null
@@ -1,84 +0,0 @@
-Return-Path: <returnPath>
-Received: from localhost (localhost [127.0.0.1])
-    by localhost (Postfix) with ESMTP id 27358B3A09;
-    Tue, 11 Oct 2016 11:59:12 +0200 (CEST)
-X-Sieve: CMU Sieve 2.2
-Date: Tue, 14 Mar 2017 16:47:05 +0100 (CET)
-From: "Test User (JIRA)" <test@localhost>
-To: you@localhost
-Message-ID: <JIRA.18278.1489506415000.375139.1489506425447@Atlassian.JIRA>
-In-Reply-To: <JIRA.18278.1489506415000@Atlassian.JIRA>
-References: <JIRA.18278.1489506415000@Atlassian.JIRA> <JIRA.18278.1489506415104@localhost>
-Subject: [JIRA] (CHAT-338) Update + icon
-MIME-Version: 1.0
-Content-Type: multipart/related;
-	boundary="----=_Part_370449_1340169331.1489506420401"
-X-JIRA-FingerPrint: 2cc56fe0b6c36a47776991d4aa5e9674
-Auto-Submitted: auto-generated
-Precedence: bulk
-
-------=_Part_370449_1340169331.1489506420401
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<a>The Test User</a> <strong>created</strong> an issue
-------=_Part_370449_1340169331.1489506420401
-Content-Type: image/png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-Content-ID: <jira-generated-image-static-major-2aab6bf2-4155-47c6-9c0b-b0ec1fdeaf9a>
-
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAMFBMVEX////QRDfQRDfQRDfQRDfQ
-RDcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFHZsIAAAABXRSTlMAEZnM3Uchgx8AAAAb
-dEVYdGppcmEtc3lzdGVtLWltYWdlLXR5cGUAaWNvbroqOUUAAABESURBVHjaY2BAAsKGQIKJgYFR
-SUkAzBBSYFIEMRiVHvwDCjExMMk9+PdIgYGF4f+9D//v8YJ1sQZAdEEACuP/BwYSAQCDPg0vvqNM
-LwAAAABJRU5ErkJggu2YDBYHBhIBAEDzBgwy4Sb4AAAAAElFTkSuQmCC
-------=_Part_370449_1340169331.1489506420401
-Content-Type: image/png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-Content-ID: <jira-generated-image-static-comment-icon-d374d5f6-0597-421c-a4ef-50f59dbc5d33>
-
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEX///+1tbWzs7OysrKrq6um
-pqalpaWdnZ2ZmZn///+VlZWPj4/7+/vu7u7p6enn5+fl5eXk5OTh4eHW1tbT09PMzMzJycm6urq5
-ubm1tbWzs7OysrKrq6upqamlpaWKioqFhYWRkZGKioqHh4eDg4OAgIB/f398fHx6enp4eHh2dnZ0
-dHRycnJwcHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-gg==
-------=_Part_370449_1340169331.1489506420401
-Content-Type: image/png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-Content-ID: <jira-generated-image-avatar-da8398c1-34c5-42a8-886f-d6628dead0f6>
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAHXRFWHRqaXJhLXN5c3RlbS1pbWFn
-ZS10eXBlAGF2YXRhcuQCGmEAAAdtSURBVHjaTdfFD5ZXEwXwZ0mBBHdoIbhT3Iq7tTgUh1KcFoq7
-Oy3W4pZAsA0JsIIFWxYECQk7Vvwf8+U3X27Txc19H7vnzJkzc+9b9evXL4YMGRLjx4+PoUOHxuDB
-g6Nt27bRqlWraNSoUbRu3TqfGT/88EPMmTMn3rx5E69fv44HDx7EzZs34+rVq3HlypX4+++/4+LF
-i3HhwoX8fe3atbhz507cv38/bt26FWvWrImRI0fGtGnTYvfu3XH58uWoXHz//ffRu3fv6Nq1a3Tr
-rkJggg==
-------=_Part_370449_1340169331.1489506420401
-Content-Type: image/png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-Content-ID: <jira-generated-image-static-task-f154c5ed-6f31-40fe-9282-434de712f077>
-
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEX///+1tbWzs7OwsLD////7
-+/v5+fn6+Pbx7enm39jZ2dnW1tbT09PPz8+9qZiwmIOojninjXaLi4uliXKjh2+egWeBgYF7e3ty
-cnJwcHCIZEWGYkOFYECDXj2CXDyBXDuBWzoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AwO/ydzq3Plz9/gBVQQxEb0tW8YAAAAASUVORK5CYII=
-------=_Part_370449_1340169331.1489506420401
-Content-Type: image/png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-Content-ID: <jira-generated-image-static-footer-desktop-logo-a08425e9-9554-4b52-8ae2-e2527647f29b>
-
-iVBORw0KGgoAAAANSUhEUgAAAKkAAAAkCAYAAADy+xopAAAAG3RFWHRqaXJhLXN5c3RlbS1pbWFn
-ZS10eXBlAGxvZ287MIqNAAAFV0lEQVR42u2cLbPrIBCGq1A4VFQUqg4VhUKh4qKizt89+U3ntjNk
-LpcB9oOkac9F7ExFwkd4uru8S3Lbvr/XYOZh4mG3C02EcexjunX73fbz8wPa88LlYV/BnmBMD5Mv
-HqwM/a7RWOa+iB3SHdKn93IRHLv5h+kTvesTzHuAMe17egOv3u2NIN1tTLzqV+LVpnCNbIByDO3M
-hX6e/Q998TqkJUh3M0nYLZkPNoV7Upuia6C2luC1+8J1SFGQ7imArnjWo2zucHZIuZDGpoJXPArY
-JbSn+iJ1OwrSNK/UUShfEUDuKYG+QDXo9sshHYOdOchX9NGi2d6TPPv+yyDJzU98EqSxdmoDTK0T
-nvfbckn7YgAAAABJRU5ErkJggg==
-------=_Part_370449_1340169331.1489506420401--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part1.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part1.eml
deleted file mode 100644
index 1c7df76ca6a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part1.eml
+++ /dev/null
@@ -1,30 +0,0 @@
-Mail content:
-To: "=?utf-8?B?UmFuaSBBc3NhZg==?=" <rani.assaf@jri.obm.lng.org>
-Subject: =?utf-8?B?VHIuIDogUGhvdG9zICE=?=
-Importance: Normal
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="----=_Part_0_1330682067197"
-
-------=_Part_0_1330682067197
-Content-Type: multipart/alternative;
-	boundary="----=_Part_2_1330682067197"
-
-------=_Part_2_1330682067197
-Content-Type: text/plain;
-	charset= utf-8
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline
-
-Content of part 1-1
-------=_Part_2_1330682067197
-Content-Type: text/html;
-	charset= utf-8
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline
-
-<b>Content of part 1-2</b>
-------=_Part_2_1330682067197--
-
-------=_Part_0_1330682067197
-Content-Type:
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part2.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part2.eml
deleted file mode 100644
index 2e81c800a01..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment-part2.eml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
-	filename="gimp.png"
-
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAALxklEQVR4Ae2Xe0xUZ97H5X4RiyAXEARURBSYCzNnLjMwwAx3huGOIBcUFJERAUVRq+KlwHABFdu+b9+0766x1W21ttnUtE3rul6aGNtm3XbdWncjaa3VXrZRK6IgfPd3Tp6wOGmyo0v/cOMknxwy5xzO7/P8LueZaWlpaU80TwWeCvy3CcRwXJlUqp39RApIOE4i5hQPxBz30hMpIJIrjktkseMimfzPUyoglilTf/XVl8u1Ik4xrOJEEMu4wSkVEMmVZ6VSTeivFXy0TDZfIlfc0qil0KpIQM59P6UCUk71lVShPD1t2jT7qQ4+Sq32prq/GhfHjSXFSxGvEfMCQ1MsoLzOadT3pArFwBQ3LSdRqK4mJyfcz0xRwaCLRVKcBDEybmxqBRTKH8uXpEOj0/1MD3wuMTHR8T9adY4LoOD3KuPj7xYVGlGYo0e6gUNKoowkpKBmHpXJZO5TKXCrpjwT5pWFSM1IvROrVH0hksujf+laAHYWi8XT+nsKyIlvVKlSeVSu0twtXpI/Yq4rR2lBKoxpamQmK5Gm55CcIAP1wxAvOWUCEk4xVLvchIaVedi8rgq1NSXjqnjdHcrGayK5yhStVPpbLLvE/Xt6Tnf3Wu529XSM9fZ13Wzbse2kJiGhK1ap/ETCqe5lGLNum+trxnZsbca6tcuwJM+AvKw4mNI1yEpVURYUSE2S8wJ3RSKN35QJUJPdM6/IQ8vaCmzdZMbObU2w7G7BhhbzeEFR4e2SsrIRChqnz5zE999/h9HREXz19SDefOt1dPW0Y8e2Frywtx0vDnRg57NrUVdTgJJ8PYpyEpBvjEdOhvahLIg55YOioiKHRxKgjwPBEaHEQzfz/3DH9mb07+nGsbeO4MjRw+jts8DS3or/GdiNnr4ufP6XC/jhh+9w587PuHdvGLdv38SNG9fwwYfvon9vN3Zvb0Td8lxUlqSirCgZpSRQnJuIgmwdcikL2elqZKUwAbni0aaQvb19M3HT2dnlloODw5Cdnd0d+rKVRFz48xkm0+i+gX5cv34NP/30I86fP4ePPjqL3n4LOjq24O2338CVK1/i22+v4ssvL+HTTz+B2WzGqlUrcfr0HzCwvw9Na8pRXZaBqtI0VBSnYGmBgUooEYUmHYQyyhDKCClJCl7gus0C9DE5OjkNpefkoXvPPugzjIiMEcN9+vQ7JHKFzvs1tzTdO3P2lBD8wYMHce3aNVBTYk1DPXp62/HHUx/g0qXPSOIyBgcHwX/u37+PiMhIiCViHP7dAbRuqAc/CJbxAktIoJAXSEKRiZURCRhJwJCoAPXcRZsF7B0dL8cq1RgeHgb/+fziX6E1pPCjDJ5e3iOUmcHWzRvHz398ThAoKSnB5b/9HYbUdMwJmUPl04GTJ9/DhQvn8cYbh/D++++D/1y/cYOvZbi6uWHvvj48u7kRgsDSdEGgjARKSOChPiCBpAQFpBx3ymYBWuXR9Zu2gH0wPj6O7KISyNRxiBJLMeMZz/GcXOP4a4cOCAJ5eXmY5eMDL29v6PUJ6O7aQX1xGOfOncLx429h5syZMDc2I05vQJQ0Fq6uriTZifWNy60yYCXAMqDVcmMiTtlrswAZPMgtLsXY2Jgg8PXVb5CYngWpSoMFi6MRsTAS7rSKnZZdeP3IIarv89ixow21tTXoaN9KE6kefdQLJ04cx5kzH0Cp5OA9axYCgoIx08sLCQlxsHS3o646F9XlGSQwuQeSJveAICBTKm49yuaRb+Drco0W6zdTM75zHJW1dVAlGvjXOULDF2ABCQQFz4FcEomdbc3o7qGpQ+za3oQtzWXY3LwUHc9twfPP9+Gd40ephN5GW9tmJCXpsHnLBrq+HS1N1VhRkYnlZemooilUzk+hgokpNPEuyExWUdlx99lb2GaBV+eGh48kJKciVq0VSofqX1j9wDkhCA4Ng0gihb+vF5pXF2K9uQgta4qxoWEJNq4l6LihoQRtW5vQRSu9d6AH//vSAI1cCzq7dmNdQxVWVmahhq3+RP3n/6t8cjO1yE5TQ59EDaxQsN8Ctk+hUH50JhqSESONFQKfF0GrToH7+AfAf3YQdIlJcHNzwdrafDTWFaCJRJqJdfVFAvzfTfR9c30xrfYytLbUotlchtXVOULwND6FICuXPLz61uWj1iruUePv4gvbZgGWhv2+fn5DesrCXCob34BAPniBoJBQJOj18KMM1NfkYM2KXGFL0VCbxwsJ0N/Cd2Y6x1+zmrYdq5YZJ1Z+OU2ejGTK6rwg4QX20Phkq59mUPLz/264SBRMAva2Sky8hWka/T4gMPBuVnY2OJUaIXPnYU7YXCQlJ0MsFkMaE05BZdPbNJtW1iRQTytMCH9T0MK5VVVC4ELN8ytPZSNsG6IjQ5C4wAkVWl+UZsYiP1sonYl9kIpWPzpW9gLFMp1wJhyYhM1bCUfqh5dp7A3J5PIHqWnpyDQaIZFKMMvbU3iD0hikwLKEAGt5KFhCWGUKlk2ZdGGrUEQlkqaXC+LBgV4ok7tik8Edr1fOwKbkGajXeaBcH4aclFik6hXC9sE7ICCK4vAhZhAutkj8UlMsopL6jZ2d/acOjo7fBAbPuW/Qax7QHkYoBZIQgqUjQ5guQm3nG3VCqeg0IsSKFmDRwlBERYZBHDUPxvhICvoZdGR54IudEfisg8Nva+aiQTcDpVq/B4qY8Ffo2QuIYCsJVk62C9gRTiyVPkFhYSqxnLuk0qqH83P0FGwmVi3PpbLJp2MeZSSbxGjlSa6yRJjxgsxSNmmWUCZo2gjjMj9LgwpDGMzxbji20h9Xu6JxpV+FI+aF4016z/u1atcPq/P1DTqdOoae7U24E46PI+DMVsCfCHN2do6OWBzdS9vqf3Bq1bAxM4FKJZMalqbQmkq00N6+eU0FGlaV0gurgErJiPLiNHpZJfN7fiqnJNawwrYZJoMYtfFeVErT8fG6WbjaGYHBPg6v1EWNdXa2Yeuz6w75+PgEshicHkfAhXiGCCDmEosJGaELCgnpiJJIByUK5YjBED++tDANtctoGq0uw4amGmxaX0vHFSRUhfqVJVhRlYeK0iwSSSaBeCoxJTQablwk40aTYvwvrta6DL9c7DF6eYsPeixtOPjqAbzw4v6hrp7OC+XV5QsfV8CJ2fsRIUQkISXURCpR6enl1b1g0eLP+d8KsQrlqEqjGtHr48ezMmhMFmWiqsyEylIjivNSKPBEJBu0UKoVD0Qy+djC6Oir7h4eA/R/mvw87FdXK13PbsyPHOnt7aAtyQmBQ4dfHe3p7by187ntOXTdPCKDcLZVwIFwI7yIQGLepCxomUQ50Ui0UTD/5+Pr925waOifFi6OuiaKlQ1JOOUYMU6CozGx8uHIqJjr/kFBJ11cXJ6ne7YSZmIpkUJoWxqXv2fp2n133/49d44de1OQOHr0CAIC/Meio6MhkUhA110jNhL21gLWEvaTGtmbmM0kFk3KRCKRRZQR9cQGoo3oIHppJPfTsY/oJtqJbUQLUUeUshVNIJSExMvLK9rT03P+upbGVd09nZfo9/XPJlM2/P390dnZKRAWFsZL8JT+OwG7SRLuxEzCn5VTOBHFRJREPKEn0ggTUcRWtoJRyr4zscwlEXHsXinLbDgbn37sWW7bdm2L9/Pzu+nu7o6NGzeitbWVshEAlokvCPsJARskXFlPeDORYJaRCCYjZuWlYNnREFqGhlCxczJ27WJ279xJgXsRHmyAOLJnnyTAQxkVjvPnz4evry94eWuBX5RgOEwSmU54ErOYzGxiDhHGpMKJCCvC2bkwFvBsFrQ3m3bTWeBO7Fl2jPUErKFy44/p1gK2ijgSzkzGnfBgQcxkAfkwfBk+DG9iJrvWg93ryoJ2nBy41bMPWQvQ7pk/LrMSeCQRe8JhkpATk3JhQblZ4crOOVsFLGwTrAOfDLv3AAErWq0FHldmktQEDlbYM+yseYTnLSOGCDD6H1/ARilrpuD/LyYuMoFDVgJPBqx3/p84YS3wpInonmQBxlOBpwJPBf4JszXhha5WvGwAAAAASUVORK5CYII=
-
-------=_Part_0_1330682067197--
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment.eml
deleted file mode 100644
index ca0abe7fd03..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneAttachment.eml
+++ /dev/null
@@ -1,38 +0,0 @@
-Mail content:
-To: "=?utf-8?B?UmFuaSBBc3NhZg==?=" <rani.assaf@jri.obm.lng.org>
-Subject: =?utf-8?B?VHIuIDogUGhvdG9zICE=?=
-Importance: Normal
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="----=_Part_0_1330682067197"
-
-------=_Part_0_1330682067197
-Content-Type: multipart/alternative;
-	boundary="----=_Part_2_1330682067197"
-
-------=_Part_2_1330682067197
-Content-Type: text/plain;
-	charset= utf-8
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline
-
-Content of part 1-1
-------=_Part_2_1330682067197
-Content-Type: text/html;
-	charset= utf-8
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline
-
-<b>Content of part 1-2</b>
-------=_Part_2_1330682067197--
-
-------=_Part_0_1330682067197
-Content-Type: application/octet-stream
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
-	filename="gimp.png"
-
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAALxklEQVR4Ae2Xe0xUZ97H5X4RiyAXEARURBSYCzNnLjMwwAx3huGOIBcUFJERAUVRq+KlwHABFdu+b9+0766x1W21ttnUtE3rul6aGNtm3XbdWncjaa3VXrZRK6IgfPd3Tp6wOGmyo0v/cOMknxwy5xzO7/P8LueZaWlpaU80TwWeCvy3CcRwXJlUqp39RApIOE4i5hQPxBz30hMpIJIrjktkseMimfzPUyoglilTf/XVl8u1Ik4xrOJEEMu4wSkVEMmVZ6VSTeivFXy0TDZfIlfc0qil0KpIQM59P6UCUk71lVShPD1t2jT7qQ4+Sq32prq/GhfHjSXFSxGvEfMCQ1MsoLzOadT3pArFwBQ3LSdRqK4mJyfcz0xRwaCLRVKcBDEybmxqBRTKH8uXpEOj0/1MD3wuMTHR8T9adY4LoOD3KuPj7xYVGlGYo0e6gUNKoowkpKBmHpXJZO5TKXCrpjwT5pWFSM1IvROrVH0hksujf+laAHYWi8XT+nsKyIlvVKlSeVSu0twtXpI/Yq4rR2lBKoxpamQmK5Gm55CcIAP1wxAvOWUCEk4xVLvchIaVedi8rgq1NSXjqnjdHcrGayK5yhStVPpbLLvE/Xt6Tnf3Wu529XSM9fZ13Wzbse2kJiGhK1ap/ETCqe5lGLNum+trxnZsbca6tcuwJM+AvKw4mNI1yEpVURYUSE2S8wJ3RSKN35QJUJPdM6/IQ8vaCmzdZMbObU2w7G7BhhbzeEFR4e2SsrIRChqnz5zE999/h9HREXz19SDefOt1dPW0Y8e2Frywtx0vDnRg57NrUVdTgJJ8PYpyEpBvjEdOhvahLIg55YOioiKHRxKgjwPBEaHEQzfz/3DH9mb07+nGsbeO4MjRw+jts8DS3or/GdiNnr4ufP6XC/jhh+9w587PuHdvGLdv38SNG9fwwYfvon9vN3Zvb0Td8lxUlqSirCgZpSRQnJuIgmwdcikL2elqZKUwAbni0aaQvb19M3HT2dnlloODw5Cdnd0d+rKVRFz48xkm0+i+gX5cv34NP/30I86fP4ePPjqL3n4LOjq24O2338CVK1/i22+v4ssvL+HTTz+B2WzGqlUrcfr0HzCwvw9Na8pRXZaBqtI0VBSnYGmBgUooEYUmHYQyyhDKCClJCl7gus0C9DE5OjkNpefkoXvPPugzjIiMEcN9+vQ7JHKFzvs1tzTdO3P2lBD8wYMHce3aNVBTYk1DPXp62/HHUx/g0qXPSOIyBgcHwX/u37+PiMhIiCViHP7dAbRuqAc/CJbxAktIoJAXSEKRiZURCRhJwJCoAPXcRZsF7B0dL8cq1RgeHgb/+fziX6E1pPCjDJ5e3iOUmcHWzRvHz398ThAoKSnB5b/9HYbUdMwJmUPl04GTJ9/DhQvn8cYbh/D++++D/1y/cYOvZbi6uWHvvj48u7kRgsDSdEGgjARKSOChPiCBpAQFpBx3ymYBWuXR9Zu2gH0wPj6O7KISyNRxiBJLMeMZz/GcXOP4a4cOCAJ5eXmY5eMDL29v6PUJ6O7aQX1xGOfOncLx429h5syZMDc2I05vQJQ0Fq6uriTZifWNy60yYCXAMqDVcmMiTtlrswAZPMgtLsXY2Jgg8PXVb5CYngWpSoMFi6MRsTAS7rSKnZZdeP3IIarv89ixow21tTXoaN9KE6kefdQLJ04cx5kzH0Cp5OA9axYCgoIx08sLCQlxsHS3o646F9XlGSQwuQeSJveAICBTKm49yuaRb+Drco0W6zdTM75zHJW1dVAlGvjXOULDF2ABCQQFz4FcEomdbc3o7qGpQ+za3oQtzWXY3LwUHc9twfPP9+Gd40ephN5GW9tmJCXpsHnLBrq+HS1N1VhRkYnlZemooilUzk+hgokpNPEuyExWUdlx99lb2GaBV+eGh48kJKciVq0VSofqX1j9wDkhCA4Ng0gihb+vF5pXF2K9uQgta4qxoWEJNq4l6LihoQRtW5vQRSu9d6AH//vSAI1cCzq7dmNdQxVWVmahhq3+RP3n/6t8cjO1yE5TQ59EDaxQsN8Ctk+hUH50JhqSESONFQKfF0GrToH7+AfAf3YQdIlJcHNzwdrafDTWFaCJRJqJdfVFAvzfTfR9c30xrfYytLbUotlchtXVOULwND6FICuXPLz61uWj1iruUePv4gvbZgGWhv2+fn5DesrCXCob34BAPniBoJBQJOj18KMM1NfkYM2KXGFL0VCbxwsJ0N/Cd2Y6x1+zmrYdq5YZJ1Z+OU2ejGTK6rwg4QX20Phkq59mUPLz/264SBRMAva2Sky8hWka/T4gMPBuVnY2OJUaIXPnYU7YXCQlJ0MsFkMaE05BZdPbNJtW1iRQTytMCH9T0MK5VVVC4ELN8ytPZSNsG6IjQ5C4wAkVWl+UZsYiP1sonYl9kIpWPzpW9gLFMp1wJhyYhM1bCUfqh5dp7A3J5PIHqWnpyDQaIZFKMMvbU3iD0hikwLKEAGt5KFhCWGUKlk2ZdGGrUEQlkqaXC+LBgV4ok7tik8Edr1fOwKbkGajXeaBcH4aclFik6hXC9sE7ICCK4vAhZhAutkj8UlMsopL6jZ2d/acOjo7fBAbPuW/Qax7QHkYoBZIQgqUjQ5guQm3nG3VCqeg0IsSKFmDRwlBERYZBHDUPxvhICvoZdGR54IudEfisg8Nva+aiQTcDpVq/B4qY8Ffo2QuIYCsJVk62C9gRTiyVPkFhYSqxnLuk0qqH83P0FGwmVi3PpbLJp2MeZSSbxGjlSa6yRJjxgsxSNmmWUCZo2gjjMj9LgwpDGMzxbji20h9Xu6JxpV+FI+aF4016z/u1atcPq/P1DTqdOoae7U24E46PI+DMVsCfCHN2do6OWBzdS9vqf3Bq1bAxM4FKJZMalqbQmkq00N6+eU0FGlaV0gurgErJiPLiNHpZJfN7fiqnJNawwrYZJoMYtfFeVErT8fG6WbjaGYHBPg6v1EWNdXa2Yeuz6w75+PgEshicHkfAhXiGCCDmEosJGaELCgnpiJJIByUK5YjBED++tDANtctoGq0uw4amGmxaX0vHFSRUhfqVJVhRlYeK0iwSSSaBeCoxJTQablwk40aTYvwvrta6DL9c7DF6eYsPeixtOPjqAbzw4v6hrp7OC+XV5QsfV8CJ2fsRIUQkISXURCpR6enl1b1g0eLP+d8KsQrlqEqjGtHr48ezMmhMFmWiqsyEylIjivNSKPBEJBu0UKoVD0Qy+djC6Oir7h4eA/R/mvw87FdXK13PbsyPHOnt7aAtyQmBQ4dfHe3p7by187ntOXTdPCKDcLZVwIFwI7yIQGLepCxomUQ50Ui0UTD/5+Pr925waOifFi6OuiaKlQ1JOOUYMU6CozGx8uHIqJjr/kFBJ11cXJ6ne7YSZmIpkUJoWxqXv2fp2n133/49d44de1OQOHr0CAIC/Meio6MhkUhA110jNhL21gLWEvaTGtmbmM0kFk3KRCKRRZQR9cQGoo3oIHppJPfTsY/oJtqJbUQLUUeUshVNIJSExMvLK9rT03P+upbGVd09nZfo9/XPJlM2/P390dnZKRAWFsZL8JT+OwG7SRLuxEzCn5VTOBHFRJREPKEn0ggTUcRWtoJRyr4zscwlEXHsXinLbDgbn37sWW7bdm2L9/Pzu+nu7o6NGzeitbWVshEAlokvCPsJARskXFlPeDORYJaRCCYjZuWlYNnREFqGhlCxczJ27WJ279xJgXsRHmyAOLJnnyTAQxkVjvPnz4evry94eWuBX5RgOEwSmU54ErOYzGxiDhHGpMKJCCvC2bkwFvBsFrQ3m3bTWeBO7Fl2jPUErKFy44/p1gK2ijgSzkzGnfBgQcxkAfkwfBk+DG9iJrvWg93ryoJ2nBy41bMPWQvQ7pk/LrMSeCQRe8JhkpATk3JhQblZ4crOOVsFLGwTrAOfDLv3AAErWq0FHldmktQEDlbYM+yseYTnLSOGCDD6H1/ARilrpuD/LyYuMoFDVgJPBqx3/p84YS3wpInonmQBxlOBpwJPBf4JszXhha5WvGwAAAAASUVORK5CYII=
-
-------=_Part_0_1330682067197--
-
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImage.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImage.eml
deleted file mode 100644
index 4a320930f3a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImage.eml
+++ /dev/null
@@ -1,82 +0,0 @@
-Return-Path: <test@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Thu, 30 Jun 2016 11:26:28 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from extranet.linagora.com (ldap.linagora.com [172.16.18.50])
-	by alderaan.linagora.com (Postfix) with ESMTP id D9D01743
-	for <test@linagora.com>; Thu, 30 Jun 2016 11:26:28 +0200 (CEST)
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="=_78be9b39405e216b14ea426a30eef65c"
-Date: Thu, 30 Jun 2016 11:26:28 +0200
-From: Test <test@linagora.com>
-To: test <test@linagora.com>
-Subject: Mail with inlined image
-Message-ID: <e544b5c4bb46598380ce57c7dd1f5340@linagora.com>
-X-Sender: test@linagora.com
-User-Agent: Roundcube Webmail/1.1.4
-
---=_78be9b39405e216b14ea426a30eef65c
-Content-Transfer-Encoding: 7bit
-Content-Type: text/plain; charset=US-ASCII
-
-Inlined image: 
-
-Signature. 
---=_78be9b39405e216b14ea426a30eef65c
-Content-Type: multipart/related;
- boundary="=_09507e56cd9618e600636c7ef4ea9f8f"
-
---=_09507e56cd9618e600636c7ef4ea9f8f
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/html; charset=UTF-8
-
-<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; charset=
-=3DUTF-8" /></head><body style=3D'font-size: 10pt; font-family: Verdana,Gen=
-eva,sans-serif'>
-<p>Inlined image:</p>
-<p><img src=3D"cid:14672787885774e5c4d4cee471352039@linagora.com" alt=3D"" =
-width=3D"32" height=3D"32" /></p>
-<p>Signature.</p>
-</body></html>
-
---=_09507e56cd9618e600636c7ef4ea9f8f
-Content-Transfer-Encoding: base64
-Content-ID: <14672787885774e5c4d4cee471352039@linagora.com>
-Content-Type: image/png;
- name=vlc.png
-Content-Disposition: inline;
- filename=vlc.png;
- size=1510
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFrUlEQVRYw8WWW2wc1RnHf+fMZS+z
-O7veXXZtr+M4Bl+IHNwrSau0ahEkNIloeCgttKoaJFT1oZUqRUJqEaqqPoAoSLRqK4FaISFUIVQQ
-IMETCBmqBpSGm9OIOKbEju11vNfZnZ29zUwfxiGUkta17PZIZ85I55zv+8///11G+L7P/3Oom704
-c2ff8R169ftCF2LBijz65cfs+zdjR2yGgSe+O5KciizOT2S9lBaF2bPCOtXIjB576mLpv7UlN/X5
-DWt/POKlXBd6LiQivql1e1/ajKlNAYhJ55AhgRaILpgaxGjd/D+R4JcPPahPpDgzHZ0bDbUdhGhi
-qzn+vJT425LfN3338eO9bQ3C/PDoFz0zPeLuOcaq0yYeCbFSrDI4XL529dRf9wBvbqsEyyuF/SP5
-q6RdK2HqPrZVJmMoVCtlkR/I3bHtMTA+dvVttuMQixlYdZuYEaVWbzCcH6Swunb9tgJ4/Mmnd5fr
-zlgmlabesDHjBg27SdKMU7HqjI2P773v4d8NbxsA56WH9l17lRa2bJuYmaTaBsNMU3Vcspk01tzJ
-UHb+2Ru3LQjN8385HP3jUZLXXI00hsipCWQIdno1eoUFxt+e5/RF/yDwhy1Pw9/fviuetRffmxh0
-B/pM0NugeiBjIMLQacOFBZgtKIVaenDyricXalsqgddsfj6mugOKCijgSXB18FTwlIBLLQRR4fZ7
-dnPflseA1ra/FgmBAPAB7yObPggJmgpRHdRu5+YtBfDrH92ihEXvQFiCFIHDS8r5l94FqCpEFFA7
-7QO/+uERdcsA2BO37g4fuXtKJLMoLsh2MEUXRAdkB9QuaIBMZbE/c9tk6is/2JAMG0I5lDa+VfKv
-kzuOPc/a0uvE63OolSV00USq4IYNHD1HWR9nSQwyFEvLd956cz8cfm1LAJz7YOn6G/bvpdjoMDT1
-dcqtHolYlFLTCdaajRHRqSyvkAspnD49y8iu0W8A920qDS+ceFxV3vjtt/2WkzlXdKOFL/ziJ4qi
-hEdHduK0OqTTfVRqdVLJBDWrjhmPsVYsYUTDnD+/iGFEef3kKWfk9CMP9HcLlhqJlSojn3vi1nue
-6W6Ige6ZZ78a++DEY3YRqr1hlosWe6cnKZXK5PODVCpVkonAecKMU65U6UuYLK8U6M9lmTs3z8Tk
-7kjx5da9o+0qmVSVdj2/ALy8oSCM1M4d9T1o+tBeXmGH9S6FSoN0doByrUHCTFCp1jDjBpVqjaQZ
-p1Spkc5kKFQa5HfuonbiTyhWCcsH14N0e+2WDWXB+Rfv0bXG4o0e4HjQ63bJvvoA/TM/o/nOcyTU
-DuVqGSORpNzoEo0nKdZbmDGD2vIcw933kU//mKE3HkW260HBAgyneOCVh7+p/UcJtFbh00q7POZp
-YHcuF5j4/AyRlRnUkyaG3o8fTROPxhASkp6N0i6Sb67QK9XRinBRBVUBRQWpQaRnTWQj3Wng5L8F
-oNfnjkiBQIVMEipl8D1AD05Lx0IpWaiAqoFUQWggVPAE9BRQ9IDahA5D/ZDqg2gCmc51Dn8cwD9J
-sPrq/TLkzB1SIqBEYWAHTF0DEQFeB7ze+hRBD3AVcOW6Yx96XfB7oAhIGfDZPbBrEsxBCKVBa84e
-smYfEVdkQHfXJnV/9TqMwJGUkAtBOg2tBnQc8Lrrtd8LnPl+0BakEpRiPQJmDlQJ0gDCAYMyBMK7
-8CnXLY8BZz8ZQPvvBzXdUz0VFDfoer4elNlEIqDLdz/CRA+EEmishECELveJXutyq8YPJBKaq2vO
-uzddEUCYMwdlEqS33u1k0GQ8Fbw6+CJwosh/DR5//eETnNOyIDPBfcS6LRW0zmvfAX7ziQCs99/b
-l5w+tG7lMgAxAEqPIJ8ueRMfK6mXVhkwhxYA+XB/HYS7+MI+9Uox8NQzyZ9PzbzwINs4zhYTP/3e
-0U38km3X+Aeuu0L8ysHGdwAAAABJRU5ErkJggg==
---=_09507e56cd9618e600636c7ef4ea9f8f--
-
---=_78be9b39405e216b14ea426a30eef65c--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImageWithoutContentDisposition.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImageWithoutContentDisposition.eml
deleted file mode 100644
index 6e165cf8309..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/oneInlinedImageWithoutContentDisposition.eml
+++ /dev/null
@@ -1,72 +0,0 @@
-Return-Path: <test@linagora.com>
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="=_78be9b39405e216b14ea426a30eef65c"
-Date: Thu, 30 Jun 2016 11:26:28 +0200
-From: Test <test@linagora.com>
-To: test <test@linagora.com>
-Subject: Mail with inlined image
-Message-ID: <e544b5c4bb46598380ce57c7dd1f5340@linagora.com>
-X-Sender: test@linagora.com
-User-Agent: Roundcube Webmail/1.1.4
-
---=_78be9b39405e216b14ea426a30eef65c
-Content-Transfer-Encoding: 7bit
-Content-Type: text/plain; charset=US-ASCII
-
-Inlined image: 
-
-Signature. 
---=_78be9b39405e216b14ea426a30eef65c
-Content-Type: multipart/related;
- boundary="=_09507e56cd9618e600636c7ef4ea9f8f"
-
---=_09507e56cd9618e600636c7ef4ea9f8f
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/html; charset=UTF-8
-
-<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; charset=
-=3DUTF-8" /></head><body style=3D'font-size: 10pt; font-family: Verdana,Gen=
-eva,sans-serif'>
-<p>Inlined image:</p>
-<p><img src=3D"cid:14672787885774e5c4d4cee471352039@linagora.com" alt=3D"" =
-width=3D"32" height=3D"32" /></p>
-<p>Signature.</p>
-</body></html>
-
---=_09507e56cd9618e600636c7ef4ea9f8f
-Content-Transfer-Encoding: base64
-Content-ID: <14672787885774e5c4d4cee471352039@linagora.com>
-Content-Type: image/png;
- name=vlc.png
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFrUlEQVRYw8WWW2wc1RnHf+fMZS+z
-O7veXXZtr+M4Bl+IHNwrSau0ahEkNIloeCgttKoaJFT1oZUqRUJqEaqqPoAoSLRqK4FaISFUIVQQ
-IMETCBmqBpSGm9OIOKbEju11vNfZnZ29zUwfxiGUkta17PZIZ85I55zv+8///11G+L7P/3Oom704
-c2ff8R169ftCF2LBijz65cfs+zdjR2yGgSe+O5KciizOT2S9lBaF2bPCOtXIjB576mLpv7UlN/X5
-DWt/POKlXBd6LiQivql1e1/ajKlNAYhJ55AhgRaILpgaxGjd/D+R4JcPPahPpDgzHZ0bDbUdhGhi
-qzn+vJT425LfN3338eO9bQ3C/PDoFz0zPeLuOcaq0yYeCbFSrDI4XL529dRf9wBvbqsEyyuF/SP5
-q6RdK2HqPrZVJmMoVCtlkR/I3bHtMTA+dvVttuMQixlYdZuYEaVWbzCcH6Swunb9tgJ4/Mmnd5fr
-zlgmlabesDHjBg27SdKMU7HqjI2P773v4d8NbxsA56WH9l17lRa2bJuYmaTaBsNMU3Vcspk01tzJ
-UHb+2Ru3LQjN8385HP3jUZLXXI00hsipCWQIdno1eoUFxt+e5/RF/yDwhy1Pw9/fviuetRffmxh0
-B/pM0NugeiBjIMLQacOFBZgtKIVaenDyricXalsqgddsfj6mugOKCijgSXB18FTwlIBLLQRR4fZ7
-dnPflseA1ra/FgmBAPAB7yObPggJmgpRHdRu5+YtBfDrH92ihEXvQFiCFIHDS8r5l94FqCpEFFA7
-7QO/+uERdcsA2BO37g4fuXtKJLMoLsh2MEUXRAdkB9QuaIBMZbE/c9tk6is/2JAMG0I5lDa+VfKv
-kzuOPc/a0uvE63OolSV00USq4IYNHD1HWR9nSQwyFEvLd956cz8cfm1LAJz7YOn6G/bvpdjoMDT1
-dcqtHolYlFLTCdaajRHRqSyvkAspnD49y8iu0W8A920qDS+ceFxV3vjtt/2WkzlXdKOFL/ziJ4qi
-hEdHduK0OqTTfVRqdVLJBDWrjhmPsVYsYUTDnD+/iGFEef3kKWfk9CMP9HcLlhqJlSojn3vi1nue
-6W6Ige6ZZ78a++DEY3YRqr1hlosWe6cnKZXK5PODVCpVkonAecKMU65U6UuYLK8U6M9lmTs3z8Tk
-7kjx5da9o+0qmVSVdj2/ALy8oSCM1M4d9T1o+tBeXmGH9S6FSoN0doByrUHCTFCp1jDjBpVqjaQZ
-p1Spkc5kKFQa5HfuonbiTyhWCcsH14N0e+2WDWXB+Rfv0bXG4o0e4HjQ63bJvvoA/TM/o/nOcyTU
-DuVqGSORpNzoEo0nKdZbmDGD2vIcw933kU//mKE3HkW260HBAgyneOCVh7+p/UcJtFbh00q7POZp
-YHcuF5j4/AyRlRnUkyaG3o8fTROPxhASkp6N0i6Sb67QK9XRinBRBVUBRQWpQaRnTWQj3Wng5L8F
-oNfnjkiBQIVMEipl8D1AD05Lx0IpWaiAqoFUQWggVPAE9BRQ9IDahA5D/ZDqg2gCmc51Dn8cwD9J
-sPrq/TLkzB1SIqBEYWAHTF0DEQFeB7ze+hRBD3AVcOW6Yx96XfB7oAhIGfDZPbBrEsxBCKVBa84e
-smYfEVdkQHfXJnV/9TqMwJGUkAtBOg2tBnQc8Lrrtd8LnPl+0BakEpRiPQJmDlQJ0gDCAYMyBMK7
-8CnXLY8BZz8ZQPvvBzXdUz0VFDfoer4elNlEIqDLdz/CRA+EEmishECELveJXutyq8YPJBKaq2vO
-uzddEUCYMwdlEqS33u1k0GQ8Fbw6+CJwosh/DR5//eETnNOyIDPBfcS6LRW0zmvfAX7ziQCs99/b
-l5w+tG7lMgAxAEqPIJ8ueRMfK6mXVhkwhxYA+XB/HYS7+MI+9Uox8NQzyZ9PzbzwINs4zhYTP/3e
-0U38km3X+Aeuu0L8ysHGdwAAAABJRU5ErkJggg==
---=_09507e56cd9618e600636c7ef4ea9f8f--
-
---=_78be9b39405e216b14ea426a30eef65c--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/sameInlinedImages.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/sameInlinedImages.eml
deleted file mode 100644
index 27050949901..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/sameInlinedImages.eml
+++ /dev/null
@@ -1,84 +0,0 @@
-Return-Path: <test@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Thu, 29 Dec 2016 04:19:28 +0100
-X-Sieve: CMU Sieve 2.2
-Received: from extranet.linagora.com (ldap.linagora.com [172.16.18.50])
-	by alderaan.linagora.com (Postfix) with ESMTP id F33174499
-	for <test@linagora.com>; Thu, 29 Dec 2016 04:19:27 +0100 (CET)
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="=_c0feb3c9f3d562fc7adebe39b63a7f62"
-Date: Thu, 29 Dec 2016 04:19:27 +0100
-From: Test <test@linagora.com>
-To: test <test@linagora.com>
-Subject: Send many inlined images
-Message-ID: <ba8178c9417b36c627a7c6de9d1470e8@linagora.com>
-X-Sender: test@linagora.com
-User-Agent: Roundcube Webmail/1.1.4
-
---=_c0feb3c9f3d562fc7adebe39b63a7f62
-Content-Transfer-Encoding: 7bit
-Content-Type: text/plain; charset=US-ASCII
-
-Add more images 
-
-  
---=_c0feb3c9f3d562fc7adebe39b63a7f62
-Content-Type: multipart/related;
- boundary="=_ebeed74b39dc10b43908b65b893b4ea4"
-
---=_ebeed74b39dc10b43908b65b893b4ea4
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/html; charset=UTF-8
-
-<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; charset=
-=3DUTF-8" /></head><body style=3D'font-size: 10pt; font-family: Verdana,Gen=
-eva,sans-serif'>
-<p>Add more images <img src=3D"cid:1482981567586480bfca67b793175279@linagor=
-a.com" alt=3D"" width=3D"163" height=3D"71" /><img src=3D"cid:1482981567586=
-480bfca67b793175279@linagora.com" alt=3D"" width=3D"163" height=3D"71" /><i=
-mg src=3D"cid:1482981567586480bfca67b793175279@linagora.com" alt=3D"" width=
-=3D"163" height=3D"71" /></p>
-<div>&nbsp;</div>
-</body></html>
-
---=_ebeed74b39dc10b43908b65b893b4ea4
-Content-Transfer-Encoding: base64
-Content-ID: <1482981567586480bfca67b793175279@linagora.com>
-Content-Type: image/png;
- name="g3619(1).png"
-Content-Disposition: inline;
- filename="g3619(1).png";
- size=1510
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFrUlEQVRYw8WWW2wc1RnHf+fMZS+z
-O7veXXZtr+M4Bl+IHNwrSau0ahEkNIloeCgttKoaJFT1oZUqRUJqEaqqPoAoSLRqK4FaISFUIVQQ
-IMETCBmqBpSGm9OIOKbEju11vNfZnZ29zUwfxiGUkta17PZIZ85I55zv+8///11G+L7P/3Oom704
-c2ff8R169ftCF2LBijz65cfs+zdjR2yGgSe+O5KciizOT2S9lBaF2bPCOtXIjB576mLpv7UlN/X5
-DWt/POKlXBd6LiQivql1e1/ajKlNAYhJ55AhgRaILpgaxGjd/D+R4JcPPahPpDgzHZ0bDbUdhGhi
-qzn+vJT425LfN3338eO9bQ3C/PDoFz0zPeLuOcaq0yYeCbFSrDI4XL529dRf9wBvbqsEyyuF/SP5
-q6RdK2HqPrZVJmMoVCtlkR/I3bHtMTA+dvVttuMQixlYdZuYEaVWbzCcH6Swunb9tgJ4/Mmnd5fr
-zlgmlabesDHjBg27SdKMU7HqjI2P773v4d8NbxsA56WH9l17lRa2bJuYmaTaBsNMU3Vcspk01tzJ
-UHb+2Ru3LQjN8385HP3jUZLXXI00hsipCWQIdno1eoUFxt+e5/RF/yDwhy1Pw9/fviuetRffmxh0
-B/pM0NugeiBjIMLQacOFBZgtKIVaenDyricXalsqgddsfj6mugOKCijgSXB18FTwlIBLLQRR4fZ7
-dnPflseA1ra/FgmBAPAB7yObPggJmgpRHdRu5+YtBfDrH92ihEXvQFiCFIHDS8r5l94FqCpEFFA7
-7QO/+uERdcsA2BO37g4fuXtKJLMoLsh2MEUXRAdkB9QuaIBMZbE/c9tk6is/2JAMG0I5lDa+VfKv
-kzuOPc/a0uvE63OolSV00USq4IYNHD1HWR9nSQwyFEvLd956cz8cfm1LAJz7YOn6G/bvpdjoMDT1
-dcqtHolYlFLTCdaajRHRqSyvkAspnD49y8iu0W8A920qDS+ceFxV3vjtt/2WkzlXdKOFL/ziJ4qi
-hEdHduK0OqTTfVRqdVLJBDWrjhmPsVYsYUTDnD+/iGFEef3kKWfk9CMP9HcLlhqJlSojn3vi1nue
-6W6Ige6ZZ78a++DEY3YRqr1hlosWe6cnKZXK5PODVCpVkonAecKMU65U6UuYLK8U6M9lmTs3z8Tk
-7kjx5da9o+0qmVSVdj2/ALy8oSCM1M4d9T1o+tBeXmGH9S6FSoN0doByrUHCTFCp1jDjBpVqjaQZ
-p1Spkc5kKFQa5HfuonbiTyhWCcsH14N0e+2WDWXB+Rfv0bXG4o0e4HjQ63bJvvoA/TM/o/nOcyTU
-DuVqGSORpNzoEo0nKdZbmDGD2vIcw933kU//mKE3HkW260HBAgyneOCVh7+p/UcJtFbh00q7POZp
-YHcuF5j4/AyRlRnUkyaG3o8fTROPxhASkp6N0i6Sb67QK9XRinBRBVUBRQWpQaRnTWQj3Wng5L8F
-oNfnjkiBQIVMEipl8D1AD05Lx0IpWaiAqoFUQWggVPAE9BRQ9IDahA5D/ZDqg2gCmc51Dn8cwD9J
-sPrq/TLkzB1SIqBEYWAHTF0DEQFeB7ze+hRBD3AVcOW6Yx96XfB7oAhIGfDZPbBrEsxBCKVBa84e
-smYfEVdkQHfXJnV/9TqMwJGUkAtBOg2tBnQc8Lrrtd8LnPl+0BakEpRiPQJmDlQJ0gDCAYMyBMK7
-8CnXLY8BZz8ZQPvvBzXdUz0VFDfoer4elNlEIqDLdz/CRA+EEmishECELveJXutyq8YPJBKaq2vO
-uzddEUCYMwdlEqS33u1k0GQ8Fbw6+CJwosh/DR5//eETnNOyIDPBfcS6LRW0zmvfAX7ziQCs99/b
-l5w+tG7lMgAxAEqPIJ8ueRMfK6mXVhkwhxYA+XB/HYS7+MI+9Uox8NQzyZ9PzbzwINs4zhYTP/3e
-0U38km3X+Aeuu0L8ysHGdwAAAABJRU5ErkJggg==
---=_ebeed74b39dc10b43908b65b893b4ea4--
-
---=_c0feb3c9f3d562fc7adebe39b63a7f62--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/textInMainMultipartHtmlInInnerMultipart.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/textInMainMultipartHtmlInInnerMultipart.eml
deleted file mode 100644
index 6e42d9177f9..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/textInMainMultipartHtmlInInnerMultipart.eml
+++ /dev/null
@@ -1,43 +0,0 @@
-To: David DOLCIMASCOLO <david.ddo@linagora.com>
-From: David DOLCIMASCOLO <david.ddo@linagora.com>
-Subject: Inline twice
-Message-ID: <03947d9b-4188-4d3a-b072-475278063036@linagora.com>
-Date: Tue, 3 Jan 2017 17:59:01 +0100
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
- Thunderbird/45.5.1
-Content-Type: multipart/alternative;
- boundary="------------41916E9CB699BB85B7A39ABF"
-
-This is a multi-part message in MIME format.
---------------41916E9CB699BB85B7A39ABF
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 8bit
-
-/blabla/
-*bloblo*
-
---------------41916E9CB699BB85B7A39ABF
-Content-Type: multipart/related;
- boundary="------------7562AB559B6C67B3BE780AA2"
-
-
---------------7562AB559B6C67B3BE780AA2
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-<i>blabla</i>
-<b>bloblo</b>
-
---------------7562AB559B6C67B3BE780AA2
-Content-Type: image/png;
- name="=?UTF-8?Q?S=c3=a9lection=5f014.png?="
-Content-Transfer-Encoding: base64
-Content-ID: <part1.C774CD18.95513753@linagora.com>
-Content-Disposition: inline;
- filename*=utf-8''%53%C3%A9%6C%65%63%74%69%6F%6E%5F%30%31%34%2E%70%6E%67
-
-iVBORw0KGgoAAAANSUhEUgAAAUcAAAJCCAIAAADcDpISAAAAA3NCSVQICAjb4U/gAAAAEHRF
-ASEB8/ejg6KNLS31fZ+u8hQAPj/AXiuIAuF4TyOAAAAAElFTkSuQmCC
---------------7562AB559B6C67B3BE780AA2--
-
---------------41916E9CB699BB85B7A39ABF--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachments.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachments.eml
deleted file mode 100644
index c6aa6fd1fd4..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachments.eml
+++ /dev/null
@@ -1,74 +0,0 @@
-Return-Path: <from@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Fri, 27 Feb 2015 20:32:14 +0100
-X-Sieve: CMU Sieve 2.2
-Received: from canondir.par.lng (unknown [92.103.166.6])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id BAB0D728
-	for <to@linagora.com>; Fri, 27 Feb 2015 20:31:38 +0100 (CET)
-X-Priority: 3 (Normal)
-From: "From"
- <from@linagora.com>
-To: "To"
- <to@linagora.com>
-Subject: [8/10]Attached Image light with text
-Date: Fri, 27 Mar 2015 21:48:38 +0100
-Message-Id: <20150227203838.0011.CanonTxNo.4037@canondir.par.lng>
-Mime-Version: 1.0
-Content-Type: multipart/mixed;
- boundary="AHNPACBLDCDIDAGGGDDFAABECGCA"
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: text/html; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 8bit
-
-<b>html tiramisu</b>
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_014.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_014.jpg"
-
-/9j/4X2cRXhpZgAASUkqAAgAAAANAA8BAgAKAAAAqgAAABABAgAJAAAAtAAAABIBAwABAAAA
-AQAAABoBBQABAAAAvgAAABsBBQABAAAAxgAAACgBAwABAAAAAgAAADEBAgAKAAAAzgAAADIB
-AgAUAAAA2AAAABMCAwABAAAAAgAAAGmHBAABAAAAfAIAAKXEBwDQAAAA7AAAANLGBwBAAAAA
-vAEAANPGBwCAAAAA/AEAAEwqAABQYW5hc29uaWMARE1DLUZaNDUAALQAAAABAAAAtAAAAAEA
-AABWZXIuMS4wICAAMjAxNDowMjoyNSAxMDozMjowOQBQcmludElNADAyNTAAAA4AAQAWABYA
-AgAAAAAAAwBkAAAABwAAAAAACAAAAAAACQAAAAAACgAAAAAACwCsAAAADAAAAAAADQAAAAAA
-DgDEAAAAAAEFAAAAAQEBAAAAEAGAAAAACREAABAnAAALDwAAECcAAJcFAAAQJwAAsAgAABAn
-AAABHAAAECcAAF4CAAAQJwAAiwAAABAnAADLAwAAECcAAOUbAAAQJwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_015.jpg"
-Content-Transfer-Encoding: base64
-Content-ID: <part1.37A15C92.A7C3488D@linagora.com>
-Content-Disposition: inline;
- filename="4037_015.jpg"
-
-iVBORw0KGgoAAAANSUhEUgAABYUAAAL4CAIAAACrzA8fAAAACXBIWXMAAAsTAAALEwEAmpwY
-AAAAB3RJTUUH3wMNDiUMca0XkQAAIABJREFUeNq8vWm0bdlVHja/tc+99zX13qv2VSeVmlIv
-FSqEOhA2AoEhxMRBg8QOyEkG6WMDSZzhMQTGDDcwiJPhBBMby4SMDJthgmOMAYvGMcF0QgIU
-WRKobymp+qpX9fp779nry4+9mjnnWuuc80qMvCpdvXrv3nP22Xutueb85je/D1/3+q+ipF9z
-nGfGdZznGCMjKaSIkJQwBYSAEMI0Tatptdrb21utVqvVtJKAAAABEAAiUP+IiECYfsfyJf1B
-10+cOHH48OGVlZVSypaWlv379zc2Nr722msNDQ2u+y9zaYQeAQAAAACCHgEAAAB0y969e+ON
-KnpOe3v7JZdccj6fwPXr10+aNKnAB956663Zs2fjTgMAAADOKzhOAQAAAFCYs+yO0XfNNQAA
-AAAA/nNBfgQAAADQDVddddW6detSqdQZ7JvL5W655RZIEgAAAAAAEayKigqcBQAAAKAAhw8f
-3rZt25AhQwYNGpTJZHq4V2tr6/bt25csWbJjxw6cQwAAAACACMiPAAAAAAAAAAAAQH8D/wgA
-AAAAAAAAAAD0N9AjAAAAAAAAAAAA0N9AjwAAAAAAAAAAAEB/Az0CAAAAAAAAAAAA/Q30CAAA
-AAAAAAAAAPQ30CMAAAAAAAAAAADQ30CPAAAAAAAAAAAAQH/z/0IKJwmNQbpqAAAAAElFTkSu
-QmCC
-
---AHNPACBLDCDIDAGGGDDFAABECGCA--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachmentsTextPlain.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachmentsTextPlain.eml
deleted file mode 100644
index 7760185a48b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoAttachmentsTextPlain.eml
+++ /dev/null
@@ -1,73 +0,0 @@
-Return-Path: <from@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Fri, 27 Feb 2015 20:32:14 +0100
-X-Sieve: CMU Sieve 2.2
-Received: from canondir.par.lng (unknown [92.103.166.6])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id BAB0D728
-	for <to@linagora.com>; Fri, 27 Feb 2015 20:31:38 +0100 (CET)
-X-Priority: 3 (Normal)
-From: "From"
- <from@linagora.com>
-To: "To"
- <to@linagora.com>
-Subject: [8/10]Attached Image light with text
-Date: Fri, 27 Mar 2015 21:48:38 +0100
-Message-Id: <20150227203838.0011.CanonTxNo.4037@canondir.par.lng>
-Mime-Version: 1.0
-Content-Type: multipart/mixed;
- boundary="AHNPACBLDCDIDAGGGDDFAABECGCA"
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 8bit
-
-html
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_014.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_014.jpg"
-
-/9j/4X2cRXhpZgAASUkqAAgAAAANAA8BAgAKAAAAqgAAABABAgAJAAAAtAAAABIBAwABAAAA
-AQAAABoBBQABAAAAvgAAABsBBQABAAAAxgAAACgBAwABAAAAAgAAADEBAgAKAAAAzgAAADIB
-AgAUAAAA2AAAABMCAwABAAAAAgAAAGmHBAABAAAAfAIAAKXEBwDQAAAA7AAAANLGBwBAAAAA
-vAEAANPGBwCAAAAA/AEAAEwqAABQYW5hc29uaWMARE1DLUZaNDUAALQAAAABAAAAtAAAAAEA
-AABWZXIuMS4wICAAMjAxNDowMjoyNSAxMDozMjowOQBQcmludElNADAyNTAAAA4AAQAWABYA
-AgAAAAAAAwBkAAAABwAAAAAACAAAAAAACQAAAAAACgAAAAAACwCsAAAADAAAAAAADQAAAAAA
-DgDEAAAAAAEFAAAAAQEBAAAAEAGAAAAACREAABAnAAALDwAAECcAAJcFAAAQJwAAsAgAABAn
-AAABHAAAECcAAF4CAAAQJwAAiwAAABAnAADLAwAAECcAAOUbAAAQJwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_015.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_015.jpg"
-
-iVBORw0KGgoAAAANSUhEUgAABYUAAAL4CAIAAACrzA8fAAAACXBIWXMAAAsTAAALEwEAmpwY
-AAAAB3RJTUUH3wMNDiUMca0XkQAAIABJREFUeNq8vWm0bdlVHja/tc+99zX13qv2VSeVmlIv
-FSqEOhA2AoEhxMRBg8QOyEkG6WMDSZzhMQTGDDcwiJPhBBMby4SMDJthgmOMAYvGMcF0QgIU
-WRKobymp+qpX9fp779nry4+9mjnnWuuc80qMvCpdvXrv3nP22Xutueb85je/D1/3+q+ipF9z
-nGfGdZznGCMjKaSIkJQwBYSAEMI0Tatptdrb21utVqvVtJKAAAABEAAiUP+IiECYfsfyJf1B
-10+cOHH48OGVlZVSypaWlv379zc2Nr722msNDQ2u+y9zaYQeAQAAAACCHgEAAAB0y969e+ON
-KnpOe3v7JZdccj6fwPXr10+aNKnAB956663Zs2fjTgMAAADOKzhOAQAAAFCYs+yO0XfNNQAA
-AAAA/nNBfgQAAADQDVddddW6detSqdQZ7JvL5W655RZIEgAAAAAAEayKigqcBQAAAKAAhw8f
-3rZt25AhQwYNGpTJZHq4V2tr6/bt25csWbJjxw6cQwAAAACACMiPAAAAAAAAAAAAQH8D/wgA
-AAAAAAAAAAD0N9AjAAAAAAAAAAAA0N9AjwAAAAAAAAAAAEB/Az0CAAAAAAAAAAAA/Q30CAAA
-AAAAAAAAAPQ30CMAAAAAAAAAAADQ30CPAAAAAAAAAAAAQH/z/0IKJwmNQbpqAAAAAElFTkSu
-QmCC
-
---AHNPACBLDCDIDAGGGDDFAABECGCA--
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoSameAttachments.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoSameAttachments.eml
deleted file mode 100644
index b76a6fe9c9a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/twoSameAttachments.eml
+++ /dev/null
@@ -1,77 +0,0 @@
-Return-Path: <from@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Fri, 27 Feb 2015 20:32:14 +0100
-X-Sieve: CMU Sieve 2.2
-Received: from canondir.par.lng (unknown [92.103.166.6])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id BAB0D728
-	for <to@linagora.com>; Fri, 27 Feb 2015 20:31:38 +0100 (CET)
-X-Priority: 3 (Normal)
-From: "From"
- <from@linagora.com>
-To: "To"
- <to@linagora.com>
-Subject: [8/10]Attached Image light with text
-Date: Fri, 27 Mar 2015 21:48:38 +0100
-Message-Id: <20150227203838.0011.CanonTxNo.4037@canondir.par.lng>
-Mime-Version: 1.0
-Content-Type: multipart/mixed;
- boundary="AHNPACBLDCDIDAGGGDDFAABECGCA"
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: text/html; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 8bit
-
-<b>html</b>
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_014.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_014.jpg"
-
-/9j/4X2cRXhpZgAASUkqAAgAAAANAA8BAgAKAAAAqgAAABABAgAJAAAAtAAAABIBAwABAAAA
-AQAAABoBBQABAAAAvgAAABsBBQABAAAAxgAAACgBAwABAAAAAgAAADEBAgAKAAAAzgAAADIB
-AgAUAAAA2AAAABMCAwABAAAAAgAAAGmHBAABAAAAfAIAAKXEBwDQAAAA7AAAANLGBwBAAAAA
-vAEAANPGBwCAAAAA/AEAAEwqAABQYW5hc29uaWMARE1DLUZaNDUAALQAAAABAAAAtAAAAAEA
-AABWZXIuMS4wICAAMjAxNDowMjoyNSAxMDozMjowOQBQcmludElNADAyNTAAAA4AAQAWABYA
-AgAAAAAAAwBkAAAABwAAAAAACAAAAAAACQAAAAAACgAAAAAACwCsAAAADAAAAAAADQAAAAAA
-DgDEAAAAAAEFAAAAAQEBAAAAEAGAAAAACREAABAnAAALDwAAECcAAJcFAAAQJwAAsAgAABAn
-AAABHAAAECcAAF4CAAAQJwAAiwAAABAnAADLAwAAECcAAOUbAAAQJwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
-Content-Type: image/jpeg;
- name="4037_014.jpg"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="4037_014.jpg"
-
-/9j/4X2cRXhpZgAASUkqAAgAAAANAA8BAgAKAAAAqgAAABABAgAJAAAAtAAAABIBAwABAAAA
-AQAAABoBBQABAAAAvgAAABsBBQABAAAAxgAAACgBAwABAAAAAgAAADEBAgAKAAAAzgAAADIB
-AgAUAAAA2AAAABMCAwABAAAAAgAAAGmHBAABAAAAfAIAAKXEBwDQAAAA7AAAANLGBwBAAAAA
-vAEAANPGBwCAAAAA/AEAAEwqAABQYW5hc29uaWMARE1DLUZaNDUAALQAAAABAAAAtAAAAAEA
-AABWZXIuMS4wICAAMjAxNDowMjoyNSAxMDozMjowOQBQcmludElNADAyNTAAAA4AAQAWABYA
-AgAAAAAAAwBkAAAABwAAAAAACAAAAAAACQAAAAAACgAAAAAACwCsAAAADAAAAAAADQAAAAAA
-DgDEAAAAAAEFAAAAAQEBAAAAEAGAAAAACREAABAnAAALDwAAECcAAJcFAAAQJwAAsAgAABAn
-AAABHAAAECcAAF4CAAAQJwAAiwAAABAnAADLAwAAECcAAOUbAAAQJwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
---AHNPACBLDCDIDAGGGDDFAABECGCA
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/windows1252charset.eml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/windows1252charset.eml
deleted file mode 100644
index a5eaedfb7b9..00000000000
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/resources/eml/windows1252charset.eml
+++ /dev/null
@@ -1,43 +0,0 @@
-Return-Path: <aduprat@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Mon, 03 Apr 2017 12:36:55 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from [10.69.0.145] (LFbn-1-9855-213.w86-202.abo.wanadoo.fr [86.202.211.213])
-	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id 5CD7B76B
-	for <aduprat@linagora.com>; Mon,  3 Apr 2017 12:36:55 +0200 (CEST)
-To: Antoine DUPRAT <aduprat@linagora.com>
-From: aduprat <aduprat@linagora.com>
-Subject: =?UTF-8?B?w6Agw6kgw6g=?=
-Message-ID: <3325d853-c33c-bc4a-4435-cd704f6a341c@linagora.com>
-Date: Mon, 3 Apr 2017 12:36:55 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
- Thunderbird/45.8.0
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="------------4609A4E8FA0583CE89472864"
-
-This is a multi-part message in MIME format.
---------------4609A4E8FA0583CE89472864
-Content-Type: text/plain; charset=windows-1252; format=flowed
-Content-Transfer-Encoding: 8bit
-
-àààà
-
-éééé
-
-èèèè
-
---------------4609A4E8FA0583CE89472864
-Content-Type: text/html; charset=windows-1252
-Content-Transfer-Encoding: 8bit
-
-<html>
-  <p>àààà</p>
-  <p>éééé</p>
-  <p>èèèè</p>
-</html>
-
---------------4609A4E8FA0583CE89472864--
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
deleted file mode 100644
index 3ef8e851c84..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.james</groupId>
-        <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>memory-jmap-draft-integration-testing</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache James :: Server :: JMAP (draft) :: Memory Integration testing</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-mailbox-api</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-mailbox-scanning-search</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-mailet-base</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>blob-export-guice</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-dnsservice-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-common</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-jmap</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-memory-app</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-memory-app</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-util</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>javax-mail-extension</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>testing-base</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-guice</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit-platform-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.javacrumbs.json-unit</groupId>
-            <artifactId>json-unit-assertj</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-suite</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.library.path=
-                        -javaagent:"${settings.localRepository}"/org/jacoco/org.jacoco.agent/${jacoco-maven-plugin.version}/org.jacoco.agent-${jacoco-maven-plugin.version}-runtime.jar=destfile=${basedir}/target/jacoco.exec
-                        -Xms512m -Xmx2048m</argLine>
-                    <forkCount>1C</forkCount>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryCorsHeaderAPITest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryCorsHeaderAPITest.java
deleted file mode 100644
index 2b422c0d855..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryCorsHeaderAPITest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.CorsHeaderAPITest;
-import org.junit.Rule;
-
-public class MemoryCorsHeaderAPITest extends CorsHeaderAPITest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFilterTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFilterTest.java
deleted file mode 100644
index f4e22924bd5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFilterTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.FilterTest;
-import org.apache.james.mailbox.inmemory.InMemoryId;
-import org.apache.james.mailbox.model.MailboxId;
-import org.junit.Rule;
-
-public class MemoryFilterTest extends FilterTest {
-    private static final AtomicLong MAILBOX_ID_GENERATOR = new AtomicLong(0);
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-
-    @Override
-    protected MailboxId randomMailboxId() {
-        return InMemoryId.of(MAILBOX_ID_GENERATOR.incrementAndGet());
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java
deleted file mode 100644
index 2aea17c67f2..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.GetMailboxesMethodTest;
-import org.junit.Rule;
-
-public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest {
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-    
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java
deleted file mode 100644
index fbb30551880..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import static org.apache.james.modules.TestJMAPServerModule.SearchModule.LIMIT_TO_3_MESSAGES;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.GetMessageListMethodTest;
-import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.store.search.PDFTextExtractor;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest {
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer(TestJMAPServerModule.SearchModule.maximumMessages(LIMIT_TO_3_MESSAGES),
-            binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class));
-    }
-    
-    @Override
-    protected void await() {
-
-    }
-
-    @Override
-    @Ignore("This feature is not supported by MessageSearchIndex implementation binded in the Memory product")
-    @Test
-    public void getMessageListShouldIncludeMessagesWhenTextFilterMatchesBodyWithStemming() {
-    }
-
-    @Override
-    @Ignore("JAMES-2756 Memory James Server uses the SimpleMessageSearchIndex, " +
-        "it doesn't support to search on the encoded header value's names")
-    @Test
-    public void searchByFromFieldShouldSupportUTF8FromName() {
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java
deleted file mode 100644
index 2b7b5a39e83..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.GetVacationResponseTest;
-import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.junit.Rule;
-
-public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException {
-        return memoryJmap.jmapServer()
-                    .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java
deleted file mode 100644
index 0b58375a1f7..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
-import org.apache.james.jmap.JMAPAuthenticationTest;
-import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.junit.Rule;
-
-public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest {
-    
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException {
-        return memoryJmap.jmapServer()
-                .overrideWith((binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryModularizeJmapDraftAuthenticationStrategyTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryModularizeJmapDraftAuthenticationStrategyTest.java
deleted file mode 100644
index 5b4148f1e04..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryModularizeJmapDraftAuthenticationStrategyTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.ModularizeJmapDraftAuthenticationStrategyTest;
-import org.apache.james.jmap.draft.JMAPDraftConfiguration;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.junit.Rule;
-
-public class MemoryModularizeJmapDraftAuthenticationStrategyTest extends ModularizeJmapDraftAuthenticationStrategyTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer(Optional<List<String>> authOverride) throws Exception {
-        return memoryJmap.jmapServer()
-            .overrideWith(binder -> binder.bind(JMAPDraftConfiguration.class)
-                .toInstance(TestJMAPServerModule
-                    .jmapDraftConfigurationBuilder()
-                    .authenticationStrategies(authOverride)
-                    .build()));
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java
deleted file mode 100644
index 2db8ff1dc4b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryProvisioningTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- * http://www.apache.org/licenses/LICENSE-2.0                   *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.ProvisioningTest;
-import org.junit.Rule;
-
-public class MemoryProvisioningTest extends ProvisioningTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryQuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryQuotaMailingTest.java
deleted file mode 100644
index ed12bd19dd2..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryQuotaMailingTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.QuotaMailingTest;
-import org.junit.Rule;
-
-public class MemoryQuotaMailingTest extends QuotaMailingTest {
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java
deleted file mode 100644
index 88b05101214..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import static org.apache.james.data.UsersRepositoryModuleChooser.Implementation.DEFAULT;
-
-import java.util.concurrent.ThreadLocalRandom;
-
-import org.apache.james.JamesServerBuilder;
-import org.apache.james.JamesServerExtension;
-import org.apache.james.MemoryJamesConfiguration;
-import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.jmap.draft.methods.integration.SendMDNMethodTest;
-import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-public class MemorySendMDNMethodTest extends SendMDNMethodTest {
-    @RegisterExtension
-    JamesServerExtension testExtension = new JamesServerBuilder<MemoryJamesConfiguration>(tmpDir ->
-        MemoryJamesConfiguration.builder()
-            .workingDirectory(tmpDir)
-            .configurationFromClasspath()
-            .usersRepository(DEFAULT)
-            .build())
-        .server(configuration -> MemoryJamesServerMain.createServer(configuration)
-            .overrideWith(new TestJMAPServerModule()))
-        .build();
-
-    @Override
-    protected MessageId randomMessageId() {
-        return new InMemoryMessageId.Factory().fromString(String.valueOf(ThreadLocalRandom.current().nextInt(100000) + 100));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java
deleted file mode 100644
index 319fa3e301d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.SetMailboxesMethodTest;
-import org.junit.Rule;
-
-public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java
deleted file mode 100644
index 0e258a30aa3..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodReRoutingTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodReRoutingTest;
-import org.junit.Rule;
-
-public class MemorySetMessagesMethodReRoutingTest extends SetMessagesMethodReRoutingTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java
deleted file mode 100644
index 19fa5ca0911..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-import java.util.concurrent.ThreadLocalRandom;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodTest;
-import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.model.MessageId;
-import org.junit.Rule;
-
-public class MemorySetMessagesMethodTest extends SetMessagesMethodTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-    
-    @Override
-    protected MessageId randomMessageId() {
-        return new InMemoryMessageId.Factory().fromString(String.valueOf(ThreadLocalRandom.current().nextInt(100000) + 100));
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesOutboxFlagUpdateTest.java
deleted file mode 100644
index 944349aa33b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesOutboxFlagUpdateTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.SetMessagesOutboxFlagUpdateTest;
-import org.apache.james.queue.api.MailQueueFactory;
-import org.junit.Rule;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-
-public class MemorySetMessagesOutboxFlagUpdateTest extends SetMessagesOutboxFlagUpdateTest {
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer(
-            new AbstractModule() {
-                @Override
-                protected void configure() {
-
-                }
-
-                @Provides
-                @Singleton
-                public MailQueueFactory<?> createActiveMailQueueFactory() {
-                    return noopMailQueueFactory;
-                }
-            }
-        );
-    }
-
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java
deleted file mode 100644
index 9e2d22c8152..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.draft.methods.integration.SetVacationResponseTest;
-import org.junit.Rule;
-
-public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java
deleted file mode 100644
index c9aa8ffd7a5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.VacationIntegrationTest;
-import org.junit.Rule;
-
-public class MemoryVacationIntegrationTest extends VacationIntegrationTest {
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return memoryJmap.jmapServer();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java
deleted file mode 100644
index b49581d0b3f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationRelayIntegrationTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory;
-
-import java.io.IOException;
-
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.apache.james.jmap.VacationRelayIntegrationTest;
-import org.junit.Rule;
-
-public class MemoryVacationRelayIntegrationTest extends VacationRelayIntegrationTest {
-
-    @Rule
-    public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
-
-    private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
-
-    @Override
-    protected GuiceJamesServer getJmapServer() throws IOException {
-        return memoryJmap.jmapServer((binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));
-    }
-
-    @Override
-    protected InMemoryDNSService getInMemoryDns() {
-        return inMemoryDNSService;
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadEnpointCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadEnpointCucumberTest.java
deleted file mode 100644
index f47529bc1cc..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadEnpointCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/DownloadEndpoint.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryDownloadEnpointCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadGetCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadGetCucumberTest.java
deleted file mode 100644
index 31274f72501..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadGetCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/DownloadGet.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryDownloadGetCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadPostCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadPostCucumberTest.java
deleted file mode 100644
index ad08536291c..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadPostCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/DownloadPost.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryDownloadPostCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryGetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryGetMessagesMethodTest.java
deleted file mode 100644
index 1bae1750166..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryGetMessagesMethodTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/GetMessages.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryGetMessagesMethodTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPKeywordsInconsistenciesTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPKeywordsInconsistenciesTest.java
deleted file mode 100644
index 2ac37e692c1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPKeywordsInconsistenciesTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/ImapKeywordsConsistency.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryIMAPKeywordsInconsistenciesTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPSetMessagesCompatibilityTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPSetMessagesCompatibilityTest.java
deleted file mode 100644
index 2fa6b52d454..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryIMAPSetMessagesCompatibilityTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryIMAPSetMessagesCompatibilityTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMailboxesMethodCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMailboxesMethodCucumberTest.java
deleted file mode 100644
index 2f1d929fdd0..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMailboxesMethodCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/MailboxModification.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemorySetMailboxesMethodCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMessagesMethodCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMessagesMethodCucumberTest.java
deleted file mode 100644
index d4c0824bd4e..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySetMessagesMethodCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/SetMessages.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemorySetMessagesMethodCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java
deleted file mode 100644
index cb8c6994b06..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/sharing")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemorySharingTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
deleted file mode 100644
index 91e311de504..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static org.apache.james.data.UsersRepositoryModuleChooser.Implementation.DEFAULT;
-
-import io.cucumber.guice.ScenarioScoped;
-import jakarta.inject.Inject;
-
-import org.apache.james.MemoryJamesConfiguration;
-import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.jmap.draft.methods.integration.cucumber.ImapStepdefs;
-import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs;
-import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.junit.rules.TemporaryFolder;
-
-import io.cucumber.java.After;
-import io.cucumber.java.Before;
-
-@ScenarioScoped
-public class MemoryStepdefs {
-    private final MainStepdefs mainStepdefs;
-    private final ImapStepdefs imapStepdefs;
-    private final TemporaryFolder temporaryFolder;
-
-    @Inject
-    private MemoryStepdefs(MainStepdefs mainStepdefs, ImapStepdefs imapStepdefs) {
-        this.mainStepdefs = mainStepdefs;
-        this.imapStepdefs = imapStepdefs;
-        this.temporaryFolder = new TemporaryFolder();
-    }
-
-    @Before
-    public void init() throws Exception {
-        temporaryFolder.create();
-        MemoryJamesConfiguration configuration = MemoryJamesConfiguration.builder()
-            .enableJMAP()
-            .workingDirectory(temporaryFolder.newFolder())
-            .configurationFromClasspath()
-            .usersRepository(DEFAULT)
-            .build();
-
-        mainStepdefs.messageIdFactory = new InMemoryMessageId.Factory();
-        mainStepdefs.jmapServer = MemoryJamesServerMain.createServer(configuration)
-                .overrideWith(new TestJMAPServerModule(),
-                        (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory));
-        mainStepdefs.init();
-    }
-
-    @After
-    public void tearDown() {
-        imapStepdefs.closeConnections();
-        mainStepdefs.tearDown();
-        temporaryFolder.delete();
-    }
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryUploadCucumberTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryUploadCucumberTest.java
deleted file mode 100644
index 3ec426b2a93..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryUploadCucumberTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.memory.cucumber;
-
-import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
-
-import org.junit.platform.suite.api.ConfigurationParameter;
-import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite(failIfNoTests = false)
-@SelectClasspathResource("cucumber/UploadEndpoint.feature")
-@IncludeEngines("cucumber")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.jmap.draft.methods.integration,org.apache.james.jmap.memory.cucumber")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @Ignore")
-public class MemoryUploadCucumberTest {
-}
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/dnsservice.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
deleted file mode 100644
index 6e4fbd2efb5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/domainlist.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/domainlist.xml
deleted file mode 100644
index fe17431a1ea..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/domainlist.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<domainlist>
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-</domainlist>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
deleted file mode 100644
index f7429d1ac37..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<imapservers>
-    <imapserver enabled="true">
-        <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-            keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-              -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <plainAuthDisallowed>false</plainAuthDisallowed>
-        <gracefulShutdown>false</gracefulShutdown>
-    </imapserver>
-</imapservers>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/keystore b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/keystore
deleted file mode 100644
index 536a6c792b0740ef4273327bf4a61ffc2d6491d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2245
zcmchY={pn*7sh8LBQ%y#WJwLmHX~!-n&e4IWZ$x7nXzWyM<b)MWgY9tF5+Q?NFo!B
zJcUq=u{<T&m$D9-SMPFN&tLF<I3IrZbv~TyKIgj6!ScZ}0000T7VzH%#k=^r2OZLN
zuO*rQ000G{h>!ymF9%GH0|)`01HpknC;&o)EW|hTnC0KzVn%TKNE#dU1v||+1tZxX
zS_9GsgkCLFCv|_)LvA!S*k!K2<bScM)do?wQ|pK&E7mnn?hF=nJO#O=X{Z2(#*vdY
zQ5{9yz9ph57H{-T9u!_k;#rV`);@W!+($~b9eY@Al-WPm3#*PYXoG$%3B?usl2hqS
z7m=*pKiG(@vedTb-Ld&D%B@Ixe^A1K;J?kzE;Y<g;E6%#wo4_lCdQRmile&pphUel
zcE?W!$7qp&DQseRKB@vP+Aelo)ReFKtlc-J+?s)#Iv$+RrYYgqY?9l9TqP&oYjG5F
zxT%Wm^hnyIIT+W=8*TMDt|#dqErsC>h)$={;+p9hHH7Nb0p>KwaVg~IFb<aQ9z2yp
zTe%@jeHXj!ZaKGTt^4&)0athS?3UC321UJGa{#-hvf~IIFFW%dt|Ps2VsE4Y!-rV%
zoh?_Pq;X(Rv%Uh2VP92UUl$KvuP#*FkZZ51eo{<g=kfQQ$gKU+$J~gY)zZq^=-Gfq
zv<oh_BHQcnp`{h_($DCB4bnYBk+0*s_Y#?pT3z{f)$uTMJifuwfK^<foxEL;RkS*;
zl?d1ri8h_Vdu2S6J&#Dt-BqGfAH#1)JUZBR*i}&K|BELM@rkB4>3Sc1wDRw9$A){s
zjWgyn8QQ_DwD67^UN~?lj{Brp?9aL{)#!<k^f-s5OCAar5S07habdA(J)Cd%oeMer
zZ`;3rTh?t-a2lR}4}Q)l*oNW=y(Q>V+F@3yd+SXoy#ls2T};RV4e2y4M<AaY2v!wr
zkA7?YXwp_VP+T=uAS5A2iSRo)pFu}*OH<a3#L4P8mtkTVd(NLiEI{H5Y1X!b^2@Sv
zai&swlN-(xq$8J@o|QRy9}8cNOn*;)E2KJ9I?Y|#zhbXL8s?MFYw1l|FY_Fpr^3ew
zb+)6&X~Ml7?-#9|CQBsAOc>YI1_L5*8Y+3@jZ}Jq=k;pjN{&W6V&8CnMam*;{LK8_
zVM=cij+9`Yn?R}TQ&+mUIg*K2CR|gqXqw>>3OJI|3T0Q6?~|~GQ+Cq*Ub<R2r>{W=
z#tEY5JH3B7<^Ay^isK!NQlyqlK>%jK4bn-JJ1I_tg1E53mrrAfv?W-!v5v*W1PD^o
zxAg%m<R$Zk%g((>|LiTHI$`?t4_QyHAX{D{qH>>39tRp>KI;&`pMqjM%_S@a>jO>`
z6pB-cdX{xVxy#YMXTrC-^vxG;KHTzHJl8ZO(ySb{-z~l#bcPwmZz!xT*qai`@=~g7
zm%`Wwk)!3E8#0=esd0RL9=xO}l_gdqO`CG<m<A6uS?h67<>H7ked&sARd)5kT$wm=
z(V}s9O156MBTz(2khxa8_$Q`dZatu&qt;^pD<4J1$qXsr6Vb23Hu=&yB~!VNc_Jq7
z>VHqD5r3dce|yB1wtClTIY>%O@DHRB{=}X}6o%-w9had83mD84mrS?s_A(A^%{Ybf
zRT$$U8`bB!I?xkR<L_l?kRCj*n4UkTHni)O9m}~{Fe*6L*jsFZ92`_*Ct_$HBqd6j
z<t0@zOnsJ!h~rsJ?b};e&k*6<CbGJbSmrHzjIaO3dbVRwOzV2MSj4H=w!-gSla@zM
zF&WW(O{SYrt3|YT$<r&_N?3eh#8ml3y|r+F*HUM!A3yOw!Dyq1L1_R0;20DU9DyQ&
zTpoczKoAJxSo(^M;^E*rN4iYf<^ck^p#YRGnj6K%0k(v22!IT4ppPBq=OG*s;I#Df
z_VW+(`=7!oz-by1?Cug0j^;%j{oMl-fL{5Xz-Ty%?>BP`95KfExp?{qx}b$oLcb-j
z058_v&mR{oY2ohUgL4l=i3{_fF(`FqRg~I!WempdH=@zXD*wg*_c%nL)ISY5{1;#%
zkPm<&0%0H`5C}-{<*=1KBbO?SE#xkKMXvqKHKh)AwKZ^R?x<Q`g2n^%uvnJE-(PWL
z_UpbD1*HsccBh6)#UpvnagDZn{=fXg8yRI$$6J+r!*-^3&kl4lMy4Gm`~q&ag>7Gq
zEJ*}Q`i!-;D;`bn<_(PMs?Z!Azhb;wGdEjk+VigAO}tt$&0gSSAkd^Qu!YeAVl>_P
zq$(ep;B$ZZRcA%4lYiy6#UI5)x3Z~7q5Zti`7%_(oi!vm`e!I-%8fY0(DZ6xzl)3s
zC8vu)lBpgh%sJWw?xJ&^Lf|}E;FK>dP{OL^>8>odoE0JSm(A1w7;@mTwWsWT<!Aw$
zyhzssz84@c5CAMYg_1yt9qv<%7lMEYt_;3yg1D>aS38liiOoY7+EQJp|1|ONst!#A
z0&q=oUM&(2S+u)9)NE3)LgN5Iy~&PWa%6*-3MUjfcyByu7<JxZYU+W*@}3#mx6cBy
zpZCBoI$v$4&ji$V5fgmY$MQC;8M-lMg!J_vnxaf#O%>b)f3tpKXQeTd-2|17(3qjJ
zuCdt!7~*+Jj-k$)2}|B;vFe5_aZzP>x+f-|h}*dnJi&WkeY1Xb&&jLmqkgpE0spgY
zybxo}kn!S$8P;k(zWJ(t|K7IXP**)mv%t;DM3PJALygR(3trmZ)bjb(P7m4wUZX6{
zTa^)O<zaV+(o0niKkIs7^j*<q^UDacEh~!-C3!i<$0sn$)LBNI@&KF~r*q<4WxVl=
V{K8-2Gv*l)4IDoswK-FH{{^s+?s5PC

diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/listeners.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/listeners.xml
deleted file mode 100644
index a1a139d2f12..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/listeners.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<listeners>
-  <listener>
-    <class>org.apache.james.mailbox.quota.mailing.listeners.QuotaThresholdCrossingListener</class>
-    <group>QuotaThresholdCrossingListener-lower-threshold</group>
-    <configuration>
-      <thresholds>
-        <threshold>
-          <value>0.1</value>
-        </threshold>
-      </thresholds>
-      <name>first</name>
-    </configuration>
-  </listener>
-  <listener>
-    <class>org.apache.james.mailbox.quota.mailing.listeners.QuotaThresholdCrossingListener</class>
-    <group>QuotaThresholdCrossingListener-upper-threshold</group>
-    <configuration>
-      <thresholds>
-        <threshold>
-          <value>0.2</value>
-        </threshold>
-      </thresholds>
-      <name>second</name>
-    </configuration>
-  </listener>
-  <listener>
-    <class>org.apache.james.jmap.event.PopulateEmailQueryViewListener</class>
-    <async>true</async>
-  </listener>
-</listeners>
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
deleted file mode 100644
index f838adb5f01..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<lmtpservers>
-
-</lmtpservers>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
deleted file mode 100644
index 68dfa629c98..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<mailetcontainer enableJmx="false">
-
-    <context>
-        <postmaster>postmaster</postmaster>
-    </context>
-
-    <spooler>
-        <threads>2</threads>
-        <errorRepository>memory://var/mail/error/</errorRepository>
-    </spooler>
-
-    <processors>
-
-        <processor state="root" enableJmx="false">
-            <mailet match="All" class="PostmasterAlias"/>
-            <mailet match="RelayLimit=30" class="Null"/>
-            <mailet match="All" class="ToProcessor">
-                <processor>transport</processor>
-            </mailet>
-        </processor>
-
-        <processor state="error" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-        </processor>
-
-        <processor state="transport" enableJmx="false">
-            <matcher name="mdn-matcher" match="org.apache.james.mailetcontainer.impl.matchers.And">
-                <matcher match="HasMimeType=multipart/report"/>
-                <matcher match="HasMimeTypeParameter=report-type=disposition-notification"/>
-            </matcher>
-            <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
-                <matcher match="SMTPAuthSuccessful"/>
-                <matcher match="SMTPIsAuthNetwork"/>
-                <matcher match="SentByMailet"/>
-                <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
-            </matcher>
-
-            <mailet match="All" class="RemoveMimeHeader">
-                <name>bcc</name>
-            </mailet>
-            <mailet match="All" class="ICSSanitizer"/>
-            <mailet match="All" class="org.apache.james.jmap.mailet.TextCalendarBodyToAttachment"/>
-            <mailet match="All" class="RecipientRewriteTable">
-                <errorProcessor>rrt-error</errorProcessor>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="VacationMailet"/>
-            <mailet match="mdn-matcher" class="org.apache.james.jmap.mailet.ExtractMDNOriginalJMAPMessageId" >
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="Sieve"/>
-            <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="RecipientIsLocal" class="LocalDelivery"/>
-            <mailet match="HostIsLocal" class="ToProcessor">
-                <processor>local-address-error</processor>
-                <notice>550 - Requested action not taken: no such user here</notice>
-            </mailet>
-
-            <mailet match="relay-allowed" class="RemoteDelivery">
-                <outgoingQueue>outgoing</outgoingQueue>
-                <delayTime>5000, 100000, 500000</delayTime>
-                <maxRetries>3</maxRetries>
-                <maxDnsProblemRetries>0</maxDnsProblemRetries>
-                <deliveryThreads>10</deliveryThreads>
-                <sendpartial>true</sendpartial>
-                <bounceProcessor>bounces</bounceProcessor>
-            </mailet>
-
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
-        </processor>
-
-        <processor state="local-address-error" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-        </processor>
-
-        <processor state="relay-denied" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-        </processor>
-
-        <processor state="bounces" enableJmx="false">
-            <mailet match="All" class="DSNBounce">
-                <passThrough>false</passThrough>
-            </mailet>
-        </processor>
-
-        <processor state="rrt-error" enableJmx="false">
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>memory://var/mail/rrt-error/</repositoryPath>
-                <passThrough>true</passThrough>
-            </mailet>
-            <mailet match="IsSenderInRRTLoop" class="Null"/>
-            <mailet match="All" class="Bounce"/>
-        </processor>
-
-    </processors>
-
-</mailetcontainer>
-
-
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
deleted file mode 100644
index ed3e003d4e2..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<mailrepositorystore>
-    <mailrepositories>
-        <mailrepository class="org.apache.james.mailrepository.memory.MemoryMailRepository">
-            <protocols>
-                <protocol>memory</protocol>
-            </protocols>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/managesieveserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/managesieveserver.xml
deleted file mode 100644
index f136a432b8a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/managesieveserver.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
- 
-<!--
-   This template file can be used as example for James Server configuration
-   DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
- 
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<managesieveservers>
-
-</managesieveservers>
-
-
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/pop3server.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/pop3server.xml
deleted file mode 100644
index bec385ae306..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/pop3server.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-
-<pop3servers>
-</pop3servers>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
deleted file mode 100644
index 060b057cd69..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<smtpservers>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <auth>
-            <announce>never</announce>
-            <requireSSL>false</requireSSL>
-            <plainAuthEnabled>true</plainAuthEnabled>
-        </auth>
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </smtpserver>
-</smtpservers>
-
-
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/usersrepository.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/usersrepository.xml
deleted file mode 100644
index 1e9092b8317..00000000000
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/usersrepository.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-<usersrepository name="LocalUsers" class="org.apache.james.user.memory.MemoryUsersRepository">
-  <enableVirtualHosting>true</enableVirtualHosting>
-  <algorithm>SHA-1</algorithm>
-</usersrepository>
diff --git a/server/protocols/jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/pom.xml
deleted file mode 100644
index 7691c5d3b55..00000000000
--- a/server/protocols/jmap-draft-integration-testing/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.james</groupId>
-        <artifactId>james-server</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>jmap-draft-integration-testing</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache James :: Server :: JMAP (draft) :: Integration testing</name>
-
-    <modules>
-        <module>jmap-draft-integration-testing-common</module>
-        <module>memory-jmap-draft-integration-testing</module>
-        <module>rabbitmq-jmap-draft-integration-testing</module>
-    </modules>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
deleted file mode 100644
index 6458fe246b9..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.james</groupId>
-        <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>rabbitmq-jmap-draft-integration-testing</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache James :: Server :: JMAP (draft) :: RabbitMQ + Object Store + Cassandra Integration testing</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-backends-cassandra</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-backends-opensearch</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-backends-rabbitmq</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-mailbox-api</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>apache-james-mailbox-scanning-search</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>blob-s3</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>blob-s3-guice</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-cassandra-app</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-distributed-app</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-distributed-app</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-dnsservice-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-common</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-guice-jmap</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-jmap-draft-integration-testing</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>james-server-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${james.groupId}</groupId>
-            <artifactId>testing-base</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-guice</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit-platform-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.javacrumbs.json-unit</groupId>
-            <artifactId>json-unit-assertj</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-suite</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.library.path=
-                        -javaagent:"${settings.localRepository}"/org/jacoco/org.jacoco.agent/${jacoco-maven-plugin.version}/org.jacoco.agent-${jacoco-maven-plugin.version}-runtime.jar=destfile=${basedir}/target/jacoco.exec
-                        -Xms512m -Xmx2048m</argLine>
-                    <reuseForks>true</reuseForks>
-                    <!-- Fail tests longer than 30 minutes, prevent form random locking tests -->
-                    <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
-                    <groups combine.self="override">org.apache.james.junit.categories.BasicFeature,org.apache.james.jmap.categories.EnableCucumber</groups>
-                    <excludedGroups>org.apache.james.junit.categories.Unstable</excludedGroups>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>unstable-tests</id>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <excludedGroups />
-                                <groups combine.self="override">org.apache.james.junit.categories.Unstable</groups>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3FilterTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3FilterTest.java
deleted file mode 100644
index c03061c78f1..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3FilterTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.FilterTest;
-import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import org.apache.james.mailbox.model.MailboxId;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3FilterTest extends FilterTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-
-    @Override
-    protected MailboxId randomMailboxId() {
-        return CassandraId.timeBased();
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMailboxesMethodTest.java
deleted file mode 100644
index 7e03c689e52..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMailboxesMethodTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.GetMailboxesMethodTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3GetMailboxesMethodTest extends GetMailboxesMethodTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java
deleted file mode 100644
index ab9c87f9e3a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import static org.apache.james.modules.TestJMAPServerModule.SearchModule.LIMIT_TO_3_MESSAGES;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.GetMessageListMethodTest;
-import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.store.search.PDFTextExtractor;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3GetMessageListMethodTest extends GetMessageListMethodTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule(),
-            binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class),
-            TestJMAPServerModule.SearchModule.maximumMessages(LIMIT_TO_3_MESSAGES));
-    }
-
-    @Override
-    protected void await() {
-        rule.await();
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java
deleted file mode 100644
index 58a83b5718f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetVacationResponseTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.GetVacationResponseTest;
-import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3GetVacationResponseTest extends GetVacationResponseTest {
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException {
-        return rule.jmapServer(cassandra.getModule())
-            .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3JmapAuthenticationTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3JmapAuthenticationTest.java
deleted file mode 100644
index 8bfbfeadc95..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3JmapAuthenticationTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
-import org.apache.james.jmap.JMAPAuthenticationTest;
-import org.apache.james.junit.categories.Unstable;
-import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.junit.Rule;
-import org.junit.experimental.categories.Category;
-
-@Category(Unstable.class)
-public class RabbitMQAwsS3JmapAuthenticationTest extends JMAPAuthenticationTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException {
-        return rule.jmapServer(cassandra.getModule())
-            .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));
-    }
-
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3ProvisioningTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3ProvisioningTest.java
deleted file mode 100644
index 7a813b35f46..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3ProvisioningTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- * http://www.apache.org/licenses/LICENSE-2.0                   *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.ProvisioningTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3ProvisioningTest extends ProvisioningTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3QuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3QuotaMailingTest.java
deleted file mode 100644
index 8e2aa7f98fe..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3QuotaMailingTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.QuotaMailingTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3QuotaMailingTest extends QuotaMailingTest {
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
deleted file mode 100644
index 971a41cca46..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import org.apache.james.CassandraExtension;
-import org.apache.james.CassandraRabbitMQJamesConfiguration;
-import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerOpenSearchExtension;
-import org.apache.james.JamesServerBuilder;
-import org.apache.james.JamesServerExtension;
-import org.apache.james.SearchConfiguration;
-import org.apache.james.jmap.draft.methods.integration.SendMDNMethodTest;
-import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.modules.AwsS3BlobStoreExtension;
-import org.apache.james.modules.RabbitMQExtension;
-import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.modules.blobstore.BlobStoreConfiguration;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest {
-
-    @RegisterExtension
-    JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
-        CassandraRabbitMQJamesConfiguration.builder()
-            .workingDirectory(tmpDir)
-            .configurationFromClasspath()
-            .blobStore(BlobStoreConfiguration.builder()
-                    .s3()
-                    .disableCache()
-                    .deduplication()
-                    .noCryptoConfig())
-            .searchConfiguration(SearchConfiguration.openSearch())
-            .build())
-        .extension(new DockerOpenSearchExtension())
-        .extension(new CassandraExtension())
-        .extension(new AwsS3BlobStoreExtension())
-        .extension(new RabbitMQExtension())
-        .server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
-            .overrideWith(new TestJMAPServerModule()))
-        .build();
-
-    @Override
-    protected MessageId randomMessageId() {
-        return new CassandraMessageId.Factory().generate();
-    }
-
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java
deleted file mode 100644
index 4392b89357f..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMailboxesMethodTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.SetMailboxesMethodTest;
-import org.apache.james.junit.categories.Unstable;
-import org.junit.Rule;
-import org.junit.experimental.categories.Category;
-
-@Category(Unstable.class)
-public class RabbitMQAwsS3SetMailboxesMethodTest extends SetMailboxesMethodTest {
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java
deleted file mode 100644
index 708753d336d..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodReRoutingTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodReRoutingTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3SetMessagesMethodReRoutingTest extends SetMessagesMethodReRoutingTest {
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java
deleted file mode 100644
index 11bd4de96aa..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.SetMessagesMethodTest;
-import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.model.MessageId;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class RabbitMQAwsS3SetMessagesMethodTest extends SetMessagesMethodTest {
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-
-    @Override
-    protected MessageId randomMessageId() {
-        return new CassandraMessageId.Factory().generate();
-    }
-
-
-    @Ignore("Temporally ignored CI failing test")
-    @Override
-    @Test
-    public void setMessagesWithABigBodyShouldReturnCreatedMessageWhenSendingMessage() {
-
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java
deleted file mode 100644
index e9ff4d6e8dd..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetVacationResponseTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.draft.methods.integration.SetVacationResponseTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3SetVacationResponseTest extends SetVacationResponseTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java
deleted file mode 100644
index 3297edafb51..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationIntegrationTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.VacationIntegrationTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3VacationIntegrationTest extends VacationIntegrationTest {
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer createJmapServer() throws IOException {
-        return rule.jmapServer(cassandra.getModule());
-    }
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java
deleted file mode 100644
index 5f9f6aa1b04..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3VacationRelayIntegrationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-
-package org.apache.james.jmap.rabbitmq;
-
-import java.io.IOException;
-
-import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
-import org.apache.james.DockerCassandraRule;
-import org.apache.james.GuiceJamesServer;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.apache.james.jmap.VacationRelayIntegrationTest;
-import org.junit.Rule;
-
-public class RabbitMQAwsS3VacationRelayIntegrationTest extends VacationRelayIntegrationTest {
-    private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
-
-    @Rule
-    public DockerCassandraRule cassandra = new DockerCassandraRule();
-
-    @Rule
-    public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule();
-
-    @Override
-    protected GuiceJamesServer getJmapServer() throws IOException {
-        return rule.jmapServer(
-                cassandra.getModule(),
-                (binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));
-    }
-
-    @Override
-    protected InMemoryDNSService getInMemoryDns() {
-        return inMemoryDNSService;
-    }
-
-}
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/dnsservice.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
deleted file mode 100644
index 6e4fbd2efb5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/dnsservice.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/domainlist.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/domainlist.xml
deleted file mode 100644
index fe17431a1ea..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/domainlist.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<domainlist>
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-</domainlist>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
deleted file mode 100644
index ec86ad6ed79..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<imapservers>
-    <imapserver enabled="true">
-        <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-            keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-              -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <plainAuthDisallowed>false</plainAuthDisallowed>
-        <gracefulShutdown>false</gracefulShutdown>
-    </imapserver>
-    <imapserver enabled="true">
-        <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-              keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <gracefulShutdown>false</gracefulShutdown>
-    </imapserver>
-</imapservers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/keystore b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/keystore
deleted file mode 100644
index 536a6c792b0740ef4273327bf4a61ffc2d6491d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2245
zcmchY={pn*7sh8LBQ%y#WJwLmHX~!-n&e4IWZ$x7nXzWyM<b)MWgY9tF5+Q?NFo!B
zJcUq=u{<T&m$D9-SMPFN&tLF<I3IrZbv~TyKIgj6!ScZ}0000T7VzH%#k=^r2OZLN
zuO*rQ000G{h>!ymF9%GH0|)`01HpknC;&o)EW|hTnC0KzVn%TKNE#dU1v||+1tZxX
zS_9GsgkCLFCv|_)LvA!S*k!K2<bScM)do?wQ|pK&E7mnn?hF=nJO#O=X{Z2(#*vdY
zQ5{9yz9ph57H{-T9u!_k;#rV`);@W!+($~b9eY@Al-WPm3#*PYXoG$%3B?usl2hqS
z7m=*pKiG(@vedTb-Ld&D%B@Ixe^A1K;J?kzE;Y<g;E6%#wo4_lCdQRmile&pphUel
zcE?W!$7qp&DQseRKB@vP+Aelo)ReFKtlc-J+?s)#Iv$+RrYYgqY?9l9TqP&oYjG5F
zxT%Wm^hnyIIT+W=8*TMDt|#dqErsC>h)$={;+p9hHH7Nb0p>KwaVg~IFb<aQ9z2yp
zTe%@jeHXj!ZaKGTt^4&)0athS?3UC321UJGa{#-hvf~IIFFW%dt|Ps2VsE4Y!-rV%
zoh?_Pq;X(Rv%Uh2VP92UUl$KvuP#*FkZZ51eo{<g=kfQQ$gKU+$J~gY)zZq^=-Gfq
zv<oh_BHQcnp`{h_($DCB4bnYBk+0*s_Y#?pT3z{f)$uTMJifuwfK^<foxEL;RkS*;
zl?d1ri8h_Vdu2S6J&#Dt-BqGfAH#1)JUZBR*i}&K|BELM@rkB4>3Sc1wDRw9$A){s
zjWgyn8QQ_DwD67^UN~?lj{Brp?9aL{)#!<k^f-s5OCAar5S07habdA(J)Cd%oeMer
zZ`;3rTh?t-a2lR}4}Q)l*oNW=y(Q>V+F@3yd+SXoy#ls2T};RV4e2y4M<AaY2v!wr
zkA7?YXwp_VP+T=uAS5A2iSRo)pFu}*OH<a3#L4P8mtkTVd(NLiEI{H5Y1X!b^2@Sv
zai&swlN-(xq$8J@o|QRy9}8cNOn*;)E2KJ9I?Y|#zhbXL8s?MFYw1l|FY_Fpr^3ew
zb+)6&X~Ml7?-#9|CQBsAOc>YI1_L5*8Y+3@jZ}Jq=k;pjN{&W6V&8CnMam*;{LK8_
zVM=cij+9`Yn?R}TQ&+mUIg*K2CR|gqXqw>>3OJI|3T0Q6?~|~GQ+Cq*Ub<R2r>{W=
z#tEY5JH3B7<^Ay^isK!NQlyqlK>%jK4bn-JJ1I_tg1E53mrrAfv?W-!v5v*W1PD^o
zxAg%m<R$Zk%g((>|LiTHI$`?t4_QyHAX{D{qH>>39tRp>KI;&`pMqjM%_S@a>jO>`
z6pB-cdX{xVxy#YMXTrC-^vxG;KHTzHJl8ZO(ySb{-z~l#bcPwmZz!xT*qai`@=~g7
zm%`Wwk)!3E8#0=esd0RL9=xO}l_gdqO`CG<m<A6uS?h67<>H7ked&sARd)5kT$wm=
z(V}s9O156MBTz(2khxa8_$Q`dZatu&qt;^pD<4J1$qXsr6Vb23Hu=&yB~!VNc_Jq7
z>VHqD5r3dce|yB1wtClTIY>%O@DHRB{=}X}6o%-w9had83mD84mrS?s_A(A^%{Ybf
zRT$$U8`bB!I?xkR<L_l?kRCj*n4UkTHni)O9m}~{Fe*6L*jsFZ92`_*Ct_$HBqd6j
z<t0@zOnsJ!h~rsJ?b};e&k*6<CbGJbSmrHzjIaO3dbVRwOzV2MSj4H=w!-gSla@zM
zF&WW(O{SYrt3|YT$<r&_N?3eh#8ml3y|r+F*HUM!A3yOw!Dyq1L1_R0;20DU9DyQ&
zTpoczKoAJxSo(^M;^E*rN4iYf<^ck^p#YRGnj6K%0k(v22!IT4ppPBq=OG*s;I#Df
z_VW+(`=7!oz-by1?Cug0j^;%j{oMl-fL{5Xz-Ty%?>BP`95KfExp?{qx}b$oLcb-j
z058_v&mR{oY2ohUgL4l=i3{_fF(`FqRg~I!WempdH=@zXD*wg*_c%nL)ISY5{1;#%
zkPm<&0%0H`5C}-{<*=1KBbO?SE#xkKMXvqKHKh)AwKZ^R?x<Q`g2n^%uvnJE-(PWL
z_UpbD1*HsccBh6)#UpvnagDZn{=fXg8yRI$$6J+r!*-^3&kl4lMy4Gm`~q&ag>7Gq
zEJ*}Q`i!-;D;`bn<_(PMs?Z!Azhb;wGdEjk+VigAO}tt$&0gSSAkd^Qu!YeAVl>_P
zq$(ep;B$ZZRcA%4lYiy6#UI5)x3Z~7q5Zti`7%_(oi!vm`e!I-%8fY0(DZ6xzl)3s
zC8vu)lBpgh%sJWw?xJ&^Lf|}E;FK>dP{OL^>8>odoE0JSm(A1w7;@mTwWsWT<!Aw$
zyhzssz84@c5CAMYg_1yt9qv<%7lMEYt_;3yg1D>aS38liiOoY7+EQJp|1|ONst!#A
z0&q=oUM&(2S+u)9)NE3)LgN5Iy~&PWa%6*-3MUjfcyByu7<JxZYU+W*@}3#mx6cBy
zpZCBoI$v$4&ji$V5fgmY$MQC;8M-lMg!J_vnxaf#O%>b)f3tpKXQeTd-2|17(3qjJ
zuCdt!7~*+Jj-k$)2}|B;vFe5_aZzP>x+f-|h}*dnJi&WkeY1Xb&&jLmqkgpE0spgY
zybxo}kn!S$8P;k(zWJ(t|K7IXP**)mv%t;DM3PJALygR(3trmZ)bjb(P7m4wUZX6{
zTa^)O<zaV+(o0niKkIs7^j*<q^UDacEh~!-C3!i<$0sn$)LBNI@&KF~r*q<4WxVl=
V{K8-2Gv*l)4IDoswK-FH{{^s+?s5PC

diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/listeners.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/listeners.xml
deleted file mode 100644
index 1ff4055a569..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/listeners.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<listeners>
-  <listener>
-    <class>org.apache.james.mailbox.cassandra.MailboxOperationLoggingListener</class>
-  </listener>
-  <listener>
-    <class>org.apache.james.mailbox.quota.mailing.listeners.QuotaThresholdCrossingListener</class>
-    <group>QuotaThresholdCrossingListener-lower-threshold</group>
-    <configuration>
-      <thresholds>
-        <threshold>
-          <value>0.1</value>
-        </threshold>
-      </thresholds>
-      <name>first</name>
-    </configuration>
-  </listener>
-  <listener>
-    <class>org.apache.james.mailbox.quota.mailing.listeners.QuotaThresholdCrossingListener</class>
-    <group>QuotaThresholdCrossingListener-upper-threshold</group>
-    <configuration>
-      <thresholds>
-        <threshold>
-          <value>0.2</value>
-        </threshold>
-      </thresholds>
-      <name>second</name>
-    </configuration>
-  </listener>
-  <listener>
-    <class>org.apache.james.jmap.event.PopulateEmailQueryViewListener</class>
-    <async>true</async>
-  </listener>
-</listeners>
\ No newline at end of file
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
deleted file mode 100644
index 1429ca68664..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<lmtpservers>
-
-    <lmtpserver enabled="true">
-        <jmxName>lmtpserver</jmxName>
-        <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <connectiontimeout>1200</connectiontimeout>
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-        <handlerchain>
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </lmtpserver>
-
-</lmtpservers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
deleted file mode 100644
index 3ded9e249c5..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<mailetcontainer enableJmx="false">
-
-    <context>
-        <postmaster>postmaster</postmaster>
-    </context>
-
-    <spooler>
-        <threads>2</threads>
-        <errorRepository>cassandra://var/mail/error/</errorRepository>
-    </spooler>
-
-    <processors>
-        <processor state="root" enableJmx="false">
-            <mailet match="All" class="PostmasterAlias"/>
-            <mailet match="RelayLimit=30" class="Null"/>
-            <mailet match="All" class="ToProcessor">
-                <processor>transport</processor>
-            </mailet>
-        </processor>
-
-        <processor state="error" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-        </processor>
-
-        <processor state="transport" enableJmx="false">
-            <matcher name="mdn-matcher" match="org.apache.james.mailetcontainer.impl.matchers.And">
-                <matcher match="HasMimeType=multipart/report"/>
-                <matcher match="HasMimeTypeParameter=report-type=disposition-notification"/>
-            </matcher>
-            <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
-                <matcher match="SMTPAuthSuccessful"/>
-                <matcher match="SMTPIsAuthNetwork"/>
-                <matcher match="SentByMailet"/>
-                <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
-            </matcher>
-
-            <mailet match="All" class="RemoveMimeHeader">
-                <name>bcc</name>
-            </mailet>
-            <mailet match="All" class="ICSSanitizer"/>
-            <mailet match="All" class="org.apache.james.jmap.mailet.TextCalendarBodyToAttachment"/>
-            <mailet match="All" class="RecipientRewriteTable">
-                <errorProcessor>rrt-error</errorProcessor>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="VacationMailet"/>
-            <mailet match="mdn-matcher" class="org.apache.james.jmap.mailet.ExtractMDNOriginalJMAPMessageId" >
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="Sieve"/>
-            <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="RecipientIsLocal" class="LocalDelivery"/>
-            <mailet match="HostIsLocal" class="ToProcessor">
-                <processor>local-address-error</processor>
-                <notice>550 - Requested action not taken: no such user here</notice>
-            </mailet>
-
-            <mailet match="relay-allowed" class="RemoteDelivery">
-                <outgoingQueue>outgoing</outgoingQueue>
-                <delayTime>5000, 100000, 500000</delayTime>
-                <maxRetries>3</maxRetries>
-                <maxDnsProblemRetries>0</maxDnsProblemRetries>
-                <deliveryThreads>10</deliveryThreads>
-                <sendpartial>true</sendpartial>
-                <bounceProcessor>bounces</bounceProcessor>
-            </mailet>
-
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
-        </processor>
-
-        <processor state="local-address-error" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-        </processor>
-
-        <processor state="relay-denied" enableJmx="false">
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-        </processor>
-
-        <processor state="bounces" enableJmx="false">
-            <mailet match="All" class="DSNBounce">
-                <passThrough>false</passThrough>
-            </mailet>
-        </processor>
-
-        <processor state="rrt-error" enableJmx="false">
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/rrt-error/</repositoryPath>
-                <passThrough>true</passThrough>
-            </mailet>
-            <mailet match="IsSenderInRRTLoop" class="Null"/>
-            <mailet match="All" class="Bounce"/>
-        </processor>
-
-    </processors>
-
-</mailetcontainer>
-
-
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
deleted file mode 100644
index 626e0a2bad8..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<mailrepositorystore>
-    <mailrepositories>
-        <mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
-            <protocols>
-                <protocol>cassandra</protocol>
-            </protocols>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
deleted file mode 100644
index 6e4473aae2b..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-
-<pop3servers>
-    <pop3server enabled="true">
-        <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-                  keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectiontimeout>1200</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <handlerchain>
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </pop3server>
-</pop3servers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
deleted file mode 100644
index 8af3fb29a9a..00000000000
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<smtpservers>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <auth>
-            <announce>never</announce>
-            <requireSSL>false</requireSSL>
-            <plainAuthEnabled>true</plainAuthEnabled>
-        </auth>
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <auth>
-            <announce>forUnauthorizedAddresses</announce>
-            <requireSSL>false</requireSSL>
-        </auth>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:0</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <auth>
-            <announce>forUnauthorizedAddresses</announce>
-            <requireSSL>false</requireSSL>
-        </auth>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-        <gracefulShutdown>false</gracefulShutdown>
-    </smtpserver>
-</smtpservers>
-
-