diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 7744b150..5d5d9d23 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -460,10 +460,9 @@ public class ExchangeSession {
      * @param messageName    message name
      * @param properties     message properties (flags)
      * @param messageBody    mail body
-     * @param allowOverwrite allow existing message overwrite
      * @throws java.io.IOException when unable to create message
      */
-    public void createMessage(String folderUrl, String messageName, HashMap<String, String> properties, String messageBody, boolean allowOverwrite) throws IOException {
+    public void createMessage(String folderUrl, String messageName, HashMap<String, String> properties, String messageBody) throws IOException {
         String messageUrl = URIUtil.encodePathQuery(folderUrl + "/" + messageName + ".EML");
         PropPatchMethod patchMethod;
         // create the message first as draft
@@ -806,7 +805,7 @@ public class ExchangeSession {
 
         String messageName = UUID.randomUUID().toString();
 
-        createMessage(draftsUrl, messageName, properties, mailBuffer.toString(), false);
+        createMessage(draftsUrl, messageName, properties, mailBuffer.toString());
 
         // warning : slide library expects *unencoded* urls
         String tempUrl = draftsUrl + "/" + messageName + ".EML";
diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index c05c243e..0a65a8ea 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -326,7 +326,7 @@ public class ImapConnection extends AbstractConnection {
                                     readClient();
 
                                     String messageName = UUID.randomUUID().toString();
-                                    session.createMessage(session.getFolderPath(folderName), messageName, properties, new String(buffer), false);
+                                    session.createMessage(session.getFolderPath(folderName), messageName, properties, new String(buffer));
                                     sendClient(commandId + " OK APPEND completed");
                                 } else if ("noop".equalsIgnoreCase(command) || "check".equalsIgnoreCase(command)) {
                                     if (currentFolder != null) {
@@ -336,6 +336,8 @@ public class ImapConnection extends AbstractConnection {
                                         sendClient("* " + currentFolder.objectCount + " RECENT");
                                     }
                                     sendClient(commandId + " OK " + command + " completed");
+                                } else if ("subscribe".equalsIgnoreCase(command) || "unsubscribe".equalsIgnoreCase(command)) {
+                                    sendClient(commandId + " OK " + command + " completed");
                                 } else {
                                     sendClient(commandId + " BAD command unrecognized");
                                 }