Merge branch 'develop'

Conflicts:
	INSTALL
	README
	USAGE

1 files changed, 3 insertions, 2 deletions

diff --git a/alot/buffer.py b/alot/buffer.py
index 4d6eca6d..eb476530 100644
--- a/alot/buffer.py
+++ b/alot/buffer.py
@@ -124,7 +124,8 @@ class EnvelopeBuffer(Buffer):
         for part in self.mail.walk():
             if not part.is_multipart():
                 if part.get_content_maintype() != 'text':
-                    lines.append(widgets.AttachmentWidget(part, selectable=False))
+                    lines.append(widgets.AttachmentWidget(part,
+                                                        selectable=False))
         self.attachment_wgt = urwid.Pile(lines)
         displayed_widgets.append(self.attachment_wgt)
 
@@ -251,10 +252,10 @@ class ThreadBuffer(Buffer):
         for mw in self.get_message_widgets():
             msg = mw.get_message()
             if msg.matches(querystring):
+                mw.fold(visible=True)
                 if 'unread' in msg.get_tags():
                     msg.remove_tags(['unread'])
                     self.ui.apply_command(command.FlushCommand())
-                mw.fold(visible=True)
 
     def get_message_widgets(self):
         return self.body.body.contents