Merge branch 'release-0.3.3'0.3.3

3 files changed, 6 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 40446be..fb62efd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.3 Sep 20:
+  o Remove cleartext mail from logs. Closes: #3877.
+
 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.
diff --git a/setup.py b/setup.py
index f4a663f..f423f7b 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-setup file for leap.mail
+Setup file for leap.mail
 """
 from setuptools import setup
 from setuptools import find_packages
@@ -56,9 +56,9 @@ setup(
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
     author_email='info@leap.se',
-    description='Mail Services in the LEAP Client project.',
+    description='Mail Services provided by Bitmask, the LEAP Client.',
     long_description=(
-        "Mail Services in the LEAP Client project."
+        "Mail Services provided by Bitmask, the LEAP Client."
     ),
     classifiers=trove_classifiers,
     namespace_packages=["leap"],
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py
index e620a58..4fb3910 100644
--- a/src/leap/mail/imap/fetch.py
+++ b/src/leap/mail/imap/fetch.py
@@ -280,7 +280,6 @@ class LeapIncomingMail(object):
         rawmsg = msg.get(self.CONTENT_KEY, None)
         if not rawmsg:
             return False
-        logger.debug('got incoming message: %s' % (rawmsg,))
         data = self._maybe_decrypt_gpg_msg(rawmsg)
         return doc, data