5 files changed, 15 insertions, 2 deletions
diff --git a/skins/default/images/buttons/drafts_act.png b/skins/default/images/buttons/drafts_act.png
new file mode 100644
index 000000000..3fc718a7f
--- /dev/null
+++ b/skins/default/images/buttons/drafts_act.png
diff --git a/skins/default/images/buttons/drafts_pas.png b/skins/default/images/buttons/drafts_pas.png
new file mode 100644
index 000000000..424709e77
--- /dev/null
+++ b/skins/default/images/buttons/drafts_pas.png
diff --git a/skins/default/images/icons/folder-drafts.png b/skins/default/images/icons/folder-drafts.png
new file mode 100644
index 000000000..d828b5687
--- /dev/null
+++ b/skins/default/images/icons/folder-drafts.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3bdbf6d16..808ab6ccb 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -225,6 +225,11 @@
   background-image: url(images/icons/folder-inbox.png);
 }
 
+#mailboxlist li.drafts
+{
+  background-image: url(images/icons/folder-drafts.png);
+}
+
 #mailboxlist li.sent
 {
   background-image: url(images/icons/folder-sent.png);
@@ -674,14 +679,14 @@ div.message-part pre
 #priority-selector
 {
   position: absolute;
-  left: 220px;
+  left: 280px;
   top: 10px;
 }
 
 #receipt-selector
 {
   position: absolute;
-  left: 390px;
+  left: 450px;
   top: 10px;
 }
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index e2f41a007..0544d7ab6 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -20,6 +20,13 @@ function rcmail_toggle_display(id)
   return false;
   }
 
+function rcmail_auto_save()
+  {
+  rcmail.command('savedraft','',this);
+  self.setTimeout('rcmail_auto_save()',300000);
+  }
+self.setTimeout('rcmail_auto_save()',300000);
+ 
 //-->
 </script>
 </head>
@@ -36,6 +43,7 @@ function rcmail_toggle_display(id)
 <!--<roundcube:button command="contacts" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="addressbook" />-->
 <roundcube:button command="spellcheck" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
 <roundcube:button command="add-attachment" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
+<roundcube:button command="savedraft" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" />
 
 <div id="priority-selector">
 <roundcube:label name="priority" />:&nbsp;<roundcube:object name="prioritySelector" form="form" />