diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 07cd978289..99f2927291 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -3824,7 +3824,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 			}
 		}
 		if (!is_array($content)) $content = array();
-		if (empty($content['FOLDER'])) $content['FOLDER']=(array)$this->mail_bo->getDraftFolder();
+		if (empty($content['FOLDER']))
+		{
+			$draft = $this->mail_bo->getDraftFolder();
+			$content['FOLDER']=(array)(preg_match($draft, "/::/") ? $draft : $this->mail_bo->profileID.'::'.$draft);
+		}
 		if (!empty($content['FOLDER']))
 		{
 			$compose = new mail_compose();