remove custom passphrase cb, eliminate code duplication

1 files changed, 11 insertions, 0 deletions

diff --git a/alot/crypto.py b/alot/crypto.py
index 47eeb7ed..911e3a17 100644
--- a/alot/crypto.py
+++ b/alot/crypto.py
@@ -1,10 +1,21 @@
 # vim:ts=4:sw=4:expandtab
 import re
 
+from email.generator import Generator
+from cStringIO import StringIO
 import pyme.core
 import pyme.constants
 
 
+def email_as_string(mail):
+    # Converting inner_msg to text with as_string() mangles lines
+    # beginning with "From", therefore we do it the hard way.
+    fp = StringIO()
+    g = Generator(fp, mangle_from_=False)
+    g.flatten(mail)
+    return RFC3156_canonicalize(fp.getvalue())
+
+
 def _engine_file_name_by_protocol(engines, protocol):
     for engine in engines:
         if engine.protocol == protocol: