From 3b610da91d63ebc4072b2c4e3aa89dfae944fcbb Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 15 Nov 2016 10:35:05 +0000
Subject: [PATCH] Use combined local drafts folder that is not synced

This prevents unencrypted draft messages leaving the local client
---
 emacs/.emacs                               | 4 +---
 offline_mail/.mbsync/aber.mbsync           | 2 +-
 offline_mail/.mbsync/personal-gmail.mbsync | 7 +------
 offline_mail/.mbsync/personal.mbsync       | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/emacs/.emacs b/emacs/.emacs
index d04d89e..c4c5da2 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -146,6 +146,7 @@
    message-send-mail-function 'smtpmail-send-it
    smtpmail-default-smtp-server "mail.friedersdorff.com"
    smtpmail-auth-credentials (expand-file-name "~/.authinfo.gpg"))
+  (setq mu4e-drafts-folder "/Drafts")
   (setq mu4e-contexts
 	`( , (make-mu4e-context
 	      :name "Personal"
@@ -158,7 +159,6 @@
 	      :vars '((user-mail-address . "max@friedersdorff.com")
 		      (user-full-name . "Maximilian Friedersdorff")
 		      (mu4e-sent-folder . "/personal/Sent")
-		      (mu4e-drafts-folder . "/personal/Drafts")
 		      (mu4e-trash-folder . "/personal/Trash")
 		      (smtpmail-smtp-server . "mail.friedersdorff.com")
 		      (smtpmail-smtp-service . 587))),
@@ -174,7 +174,6 @@
 		     (user-full-name . "Maximilian Friedersdorff")
 		     (mu4e-sent-folder . "/personal-gmail/Sent")
 		     (mu4e-sent-messages-behaviour . 'delete)
-		     (mu4e-drafts-folder . "/personal-gmail/Drafts")
 		     (smtpmail-smtp-server . "smtp.gmail.com")
 		     (smtpmail-smtp-service . 587))),
 	    (make-mu4e-context
@@ -188,7 +187,6 @@
 	     :vars '((user-mail-address . "maf54@aber.ac.uk")
 		     (user-full-name . "Maximilian Friedersdorff")
 		     (mu4e-sent-folder . "/aber/Sent")
-		     (mu4e-drafts-folder . "/aber/Drafts")
 		     (mu4e-trash-folder . "/aber/Trash")
 		     (smtpmail-smtp-server . "smtp.office365.com")
 		     (smtpmail-smtp-service . 587))))
diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync
index 5c62c22..1a996d5 100644
--- a/offline_mail/.mbsync/aber.mbsync
+++ b/offline_mail/.mbsync/aber.mbsync
@@ -15,6 +15,6 @@ Inbox ~/mail/aber/Inbox
 Channel aber 
 Master :aber-remote:
 Slave :aber-local:
-Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail"
+Patterns "INBOX" "Sent" "Trash" "Junk E-Mail"
 Create Both
 SyncState *
diff --git a/offline_mail/.mbsync/personal-gmail.mbsync b/offline_mail/.mbsync/personal-gmail.mbsync
index abc355e..7f47f38 100644
--- a/offline_mail/.mbsync/personal-gmail.mbsync
+++ b/offline_mail/.mbsync/personal-gmail.mbsync
@@ -24,12 +24,6 @@ Slave :gmail-local:"All Mail"
 SyncState *
 Create Slave
 
-Channel gmail-all-drafts
-Master :gmail-remote:"[Gmail]/Drafts"
-Slave :gmail-local:"Drafts"
-SyncState *
-Create Slave
-
 Channel gmail-all-spam
 Master :gmail-remote:"[Gmail]/Spam"
 Slave :gmail-local:"Spam"
@@ -47,3 +41,4 @@ Group gmail
 Channel gmail-default
 Channel gmail-sent
 Channel gmail-all-mail
+Channel gmail-all-spam
diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync
index e2e6472..45a3103 100644
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@ -15,6 +15,6 @@ Inbox ~/mail/personal/Inbox
 Channel personal
 Master :personal-remote:
 Slave :personal-local:
-Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware" "quicknote" "todo"
+Patterns "INBOX" "Sent" "Spam" "Trash" "slackware" "quicknote" "todo"
 Create Both
 SyncState *
-- 
2.45.2