Merge branch 'master' of github.com:M66B/FairEmail

FAQ.md

@@ -2678,4 +2678,6 @@ Features not fulfilling these requirements will likely be rejected.
 
 If you have another question, want to request a feature or report a bug, please use [this form](https://contact.faircode.eu/?product=fairemailsupport).
 
+GitHub issues have been disabled due to frequent abuse.
+
 Copyright © 2018-2020 Marcel Bokhorst.

README.md

@@ -94,7 +94,7 @@ All pro features are convenience or advanced features.
 * Filter rules ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq71))
 * Search indexing, search on server ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq13))
 * Keyword management
-* S/MIME sign/encrypt
+* S/MIME sign/encrypt ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq12))
 * Biometric authentication ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq113))
 * Unified inbox widget
 * Export settings

metadata/en-US/full_description.txt

@@ -27,7 +27,7 @@ This app starts a foreground service with a low priority status bar notification
 
 <b>Privacy features</b>
 
-* Encryption/decryption supported (OpenPGP and S/MIME)
+* Encryption/decryption supported (OpenPGP, S/MIME)
 * Reformat messages to prevent phishing
 * Confirm showing images to prevent tracking
 * Confirm opening links to prevent tracking and phishing