--- /dev/null
+Return-Path: <awg@lagos.xvx.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9D7BE431FAF\r
+ for <notmuch@notmuchmail.org>; Fri, 3 Feb 2012 16:32:39 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id T+GRyGPNf1g9 for <notmuch@notmuchmail.org>;\r
+ Fri, 3 Feb 2012 16:32:39 -0800 (PST)\r
+Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0A48D431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 3 Feb 2012 16:32:38 -0800 (PST)\r
+Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139])\r
+ by pd4mo1so-svcs.prod.shaw.ca with ESMTP; 03 Feb 2012 17:32:37 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=2TvZ7eE48NdEYeaL5Xf58dNzJU178UzT+2lxUZ5Mhss=\r
+ c=1 sm=1\r
+ a=MH2TWjp3dmsA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+ a=m9MuwA_Wz9pqlhpKPbkA:9 a=XuiGcvX9-2D4EZ-nJk0A:7\r
+ a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+ by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 03 Feb 2012 17:32:37 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+ id B720E800C338; Fri, 3 Feb 2012 17:32:36 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/2] Bug and potential fix: forwarded messages\r
+Date: Fri, 3 Feb 2012 17:32:31 -0700\r
+Message-Id: <1328315554-16085-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 04 Feb 2012 00:32:39 -0000\r
+\r
+Hi everyone,\r
+\r
+I encountered today a bug that I remember being mentioned on IRC where\r
+some messages are shown in emacs as completely empty, even though their\r
+content is present and simple. For me, the bug shows up with messages that\r
+have been forwarded by an Outlook user who didn't add any content to the top\r
+of the message. The first line of the message is "-----Original Message-----",\r
+and the rest is the forwarded text. Notmuch tries to collapse the forwarded\r
+content into a button, but fails mysteriously.\r
+\r
+The first patch in this series adds a test (marked as broken) that demonstrates\r
+the bug. I think this should be pushed regardless of whether my solution is\r
+the right one. My solution is to check whether we're collapsing the entire\r
+message before doing so, and avoid turning it into a button if that's the case.\r
+I think this is a desirable behavior, since if someone has forwarded a message\r
+without adding anything the user probably wants to read that message. But,\r
+I'll admit that I didn't figure out the real cause of the problem, and I\r
+would be happy to hear other suggestions.\r
+\r
+It also occurs to me that this might indicate a bigger problem with how\r
+notmuch-wash.el handles messages starting with "-----Original Message-----".\r
+Notmuch seems to assume that this indicates the rest of the message is quoted\r
+stuff that's been top-posted on. In my office this isn't necessarily the case,\r
+since Outlook produces that line at the top of every reply, and it's up to\r
+the user whether to top-post or not (and not everyone does).\r
+\r
+I'll have to experiment a bit more to verify whether a problem (i.e. whether\r
+Notmuch hides inappropriate things when someone replies inline with Outlook).\r
+Someone please correct me if I'm missing something in how the code operates.\r
+\r
+Adam Wolfe Gordon (2):\r
+ test: Add broken test for showing forwarded messages\r
+ emacs: Fix broken showing of forwarded messages.\r
+\r
+ emacs/notmuch-wash.el | 5 +++--\r
+ test/emacs | 32 ++++++++++++++++++++++++++++++++\r
+ 2 files changed, 35 insertions(+), 2 deletions(-)\r
+\r
+-- \r
+1.7.5.4\r
+\r