Fold in changes

11 files changed, 22 insertions, 18 deletions

diff --git a/mail/CHANGELOG b/mail/CHANGELOG
index 5755e593..f15482c4 100644
--- a/mail/CHANGELOG
+++ b/mail/CHANGELOG
@@ -1,3 +1,23 @@
+0.3.7 Nov 15:
+  o Uses deferToThread for sendMail. Closes #3937
+  o Update pkey to allow multiple accounts. Solves: #4394
+  o Change SMTP service name from "relay" to "gateway". Closes #4416.
+  o Identify ourselves with a fqdn, always. Closes: #4441
+  o Remove 'multipart/encrypted' header after decrypting incoming
+    mail. Closes #4454.
+  o Fix several bugs with imap mailbox getUIDNext and notifiers that
+    were breaking the mail indexing after message deletion. This
+    solves also the perceived mismatch between the number of unread
+    mails reported by bitmask_client and the number reported by
+    MUAs. Closes: #4461
+  o Check username in authentications. Closes: #4299
+  o Reject senders that aren't the user that is currently logged
+    in. Fixes #3952.
+  o Prevent already encrypted outgoing messages from being encrypted
+    again. Closes #4324.
+  o Correctly handle email headers when gatewaying messages. Also add
+    OpenPGP header. Closes #4322 and #4447.
+
 0.3.6 Nov 1:
   o Add support for non-ascii characters in emails. Closes #4000.
   o Default to UTF-8 when there is no charset parsed from the mail
@@ -23,7 +43,8 @@
 
 0.3.2 Sep 6:
   o Make mail services bind to 127.0.0.1. Closes: #3627.
-  o Signal unread message to UI when message is saved locally. Closes: #3654.
+  o Signal unread message to UI when message is saved locally. Closes:
+    #3654.
   o Signal unread to UI when flag in message change. Closes: #3662.
   o Use dirspec instead of plain xdg. Closes #3574.
   o SMTP service invocation returns factory instance.
diff --git a/mail/changes/bug_3937_fix_ui_freeze b/mail/changes/bug_3937_fix_ui_freeze
deleted file mode 100644
index b91938c5..00000000
--- a/mail/changes/bug_3937_fix_ui_freeze
+++ /dev/null
@@ -1 +0,0 @@
-  o Uses deferToThread for sendMail. Closes #3937
diff --git a/mail/changes/bug_4394-update-pkey b/mail/changes/bug_4394-update-pkey
deleted file mode 100644
index d0a60b11..00000000
--- a/mail/changes/bug_4394-update-pkey
+++ /dev/null
@@ -1 +0,0 @@
-  o Update pkey to allow multiple accounts. Solves: #4394
diff --git a/mail/changes/bug_4416-change-smtp-relay-to-gateway b/mail/changes/bug_4416-change-smtp-relay-to-gateway
deleted file mode 100644
index 08bead7e..00000000
--- a/mail/changes/bug_4416-change-smtp-relay-to-gateway
+++ /dev/null
@@ -1 +0,0 @@
-  o Change SMTP service name from "relay" to "gateway". Closes #4416.
diff --git a/mail/changes/bug_4441_fix-fqdn b/mail/changes/bug_4441_fix-fqdn
deleted file mode 100644
index e758d65e..00000000
--- a/mail/changes/bug_4441_fix-fqdn
+++ /dev/null
@@ -1 +0,0 @@
-  o Identify ourselves with a fqdn, always. Closes: #4441
diff --git a/mail/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting b/mail/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting
deleted file mode 100644
index 8aa0aaae..00000000
--- a/mail/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove 'multipart/encrypted' header after decrypting incoming mail. Closes
-    #4454.
diff --git a/mail/changes/bug_4461_fix-uid-indexing b/mail/changes/bug_4461_fix-uid-indexing
deleted file mode 100644
index 881bb244..00000000
--- a/mail/changes/bug_4461_fix-uid-indexing
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Fix several bugs with imap mailbox getUIDNext and notifiers that were breaking
-    the mail indexing after message deletion. This solves also the perceived
-    mismatch between the number of unread mails reported by bitmask_client and
-    the number reported by MUAs. Closes: #4461
diff --git a/mail/changes/bug_imap-user-check b/mail/changes/bug_imap-user-check
deleted file mode 100644
index 678871dc..00000000
--- a/mail/changes/bug_imap-user-check
+++ /dev/null
@@ -1 +0,0 @@
-  o Check username in authentications. Closes: #4299
diff --git a/mail/changes/bug_reject_bad_sender b/mail/changes/bug_reject_bad_sender
deleted file mode 100644
index 0e46c287..00000000
--- a/mail/changes/bug_reject_bad_sender
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Reject senders that aren't the user that is currently logged
-    in. Fixes #3952.
\ No newline at end of file
diff --git a/mail/changes/feature-4324_prevent-double-encryption-when-relaying b/mail/changes/feature-4324_prevent-double-encryption-when-relaying
deleted file mode 100644
index a3d70a9e..00000000
--- a/mail/changes/feature-4324_prevent-double-encryption-when-relaying
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Prevent already encrypted outgoing messages from being encrypted again.
-    Closes #4324.
diff --git a/mail/changes/feature_4447-4322-fix-headers-when-gatewaying-messages b/mail/changes/feature_4447-4322-fix-headers-when-gatewaying-messages
deleted file mode 100644
index 986937cc..00000000
--- a/mail/changes/feature_4447-4322-fix-headers-when-gatewaying-messages
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Correctly handle email headers when gatewaying messages. Also add
-    OpenPGP header. Closes #4322 and #4447.