Fold in changes

9 files changed, 16 insertions, 12 deletions

diff --git a/mail/CHANGELOG b/mail/CHANGELOG
index f15482c4..fea58c85 100644
--- a/mail/CHANGELOG
+++ b/mail/CHANGELOG
@@ -1,3 +1,19 @@
+0.3.8 Dec 6:
+  o Fail gracefully when failing to decrypt incoming messages. Closes
+    #4589.
+  o Fix a bug when adding a message with empty flags. Closes #4496
+  o Allow to iterate in an empty mailbox during fetch. Closes #4603
+  o Add 'signencrypt' preference to OpenPGP header on outgoing
+    email. Closes #3878.
+  o Add a header to incoming emails that reflects if a valid signature
+    was found when decrypting. Closes #4354.
+  o Add a footer to outgoing email pointing to the address where
+    sender keys can be fetched. Closes #4526.
+  o Serialize Soledad Writes for new messages. Fixes segmentation
+    fault when sqlcipher was been concurrently accessed from many
+    threads. Closes #4606
+  o Set remote mail polling time to 60 seconds. Closes #4499
+
 0.3.7 Nov 15:
   o Uses deferToThread for sendMail. Closes #3937
   o Update pkey to allow multiple accounts. Solves: #4394
diff --git a/mail/changes/bug_4589_fail-gracefully-when-failing-to-decrypt-incoming-messages b/mail/changes/bug_4589_fail-gracefully-when-failing-to-decrypt-incoming-messages
deleted file mode 100644
index d3766834..00000000
--- a/mail/changes/bug_4589_fail-gracefully-when-failing-to-decrypt-incoming-messages
+++ /dev/null
@@ -1 +0,0 @@
-  o Fail gracefully when failing to decrypt incoming messages. Closes #4589.
diff --git a/mail/changes/bug_fix-empty-flags b/mail/changes/bug_fix-empty-flags
deleted file mode 100644
index a109ef56..00000000
--- a/mail/changes/bug_fix-empty-flags
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix a bug when adding a message with empty flags. Closes: #4496
diff --git a/mail/changes/bug_fix-iteration-empty-mailbox b/mail/changes/bug_fix-iteration-empty-mailbox
deleted file mode 100644
index 11dd770c..00000000
--- a/mail/changes/bug_fix-iteration-empty-mailbox
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow to iterate in an empty mailbox during fetch. Closes: #4603
diff --git a/mail/changes/feature_3878_add-preference-to-openpgp-header b/mail/changes/feature_3878_add-preference-to-openpgp-header
deleted file mode 100644
index 4513bf6a..00000000
--- a/mail/changes/feature_3878_add-preference-to-openpgp-header
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add 'signencrypt' preference to OpenPGP header on outgoing email. Closes
-    #3878".
diff --git a/mail/changes/feature_4354_add-signature-header-to-incoming-email b/mail/changes/feature_4354_add-signature-header-to-incoming-email
deleted file mode 100644
index 866b68ef..00000000
--- a/mail/changes/feature_4354_add-signature-header-to-incoming-email
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add a header to incoming emails that reflects if a valid signature was
-    found when decrypting. Closes #4354.
diff --git a/mail/changes/feature_4526_add-footer-to-outgoing-email b/mail/changes/feature_4526_add-footer-to-outgoing-email
deleted file mode 100644
index 60308add..00000000
--- a/mail/changes/feature_4526_add-footer-to-outgoing-email
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add a footer to outgoing email pointing to the address where sender keys
-    can be fetched. Closes #4526.
diff --git a/mail/changes/feature_4606-serialize-soledad-writes b/mail/changes/feature_4606-serialize-soledad-writes
deleted file mode 100644
index 5dfb8eee..00000000
--- a/mail/changes/feature_4606-serialize-soledad-writes
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Serialize Soledad Writes for new messages. Fixes segmentation fault when sqlcipher was
-    been concurrently accessed from many threads. Closes: #4606
diff --git a/mail/changes/feature_reduce-polling-time b/mail/changes/feature_reduce-polling-time
deleted file mode 100644
index 85badcaf..00000000
--- a/mail/changes/feature_reduce-polling-time
+++ /dev/null
@@ -1 +0,0 @@
-  o Set remote mail polling time to 60 seconds. Closes: #4499