diff --git a/src/backend/imap/imap.php b/src/backend/imap/imap.php
index 25df403c..2b9c103b 100644
--- a/src/backend/imap/imap.php
+++ b/src/backend/imap/imap.php
@@ -1112,6 +1112,16 @@ public function GetMessageList($folderid, $cutoffdate) {
                     $message["star"] = 0;
                 }
 
+                // 'draft'
+                $isdraftfolder = ($this->GetFolder($this->getFolderIdFromImapId($folderid))->type === SYNC_FOLDER_TYPE_DRAFTS);
+
+                if ((isset($overview->draft) && $overview->draft) || $isdraftfolder) {
+                    $message["draft"] = 1;
+                }
+                else {
+                    $message["draft"] = 0;
+                }
+
                 $messages[] = $message;
             }
         }
@@ -1362,6 +1372,14 @@ public function GetMessage($folderid, $id, $contentparameters) {
                         $output->lastverbexecuted = SYNC_MAIL_LASTVERB_UNKNOWN;
                     }
                 }
+                
+                if (Request::GetProtocolVersion() >= 16.0) {
+
+                    //set so message is fully exported
+                    if (isset($stat["draft"]) && $stat["draft"]) {
+                        $output->isdraft = true;
+                    }
+                }                
             }
 
             $Mail_RFC822 = new Mail_RFC822();
@@ -1622,6 +1640,16 @@ public function StatMessage($folderid, $id) {
             $entry["star"] = 0;
         }
 
+        // 'draft'
+        $isdraftfolder = ($this->GetFolder($folderid)->type === SYNC_FOLDER_TYPE_DRAFTS);
+
+        if ((isset($overview->draft) && $overview->draft) || $isdraftfolder) {
+            $entry["draft"] = 1;
+        }
+        else {
+            $entry["draft"] = 0;
+        }
+
         return $entry;
     }