--- /dev/null
+Return-Path: <felipe.contreras@gmail.com>\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 D4554431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 07:03:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 gGO1rvHhD36d for <notmuch@notmuchmail.org>;\r
+ Sat, 2 Nov 2013 07:03:47 -0700 (PDT)\r
+Received: from mail-oa0-f46.google.com (mail-oa0-f46.google.com\r
+ [209.85.219.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7154E431FDB\r
+ for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 07:03:07 -0700 (PDT)\r
+Received: by mail-oa0-f46.google.com with SMTP id g12so5621396oah.19\r
+ for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:07 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=smUbuqwxaJsslh3qGYPSC+UDs4UShSBksoOOhH5/RBw=;\r
+ b=CySy+f5iHfLpVOgJWnesekN5oSz3etus+V4SVyANpg9rh6Ue0nI0dwjAldKnsFpKG/\r
+ Y08auCzf8/qhEd1hGx3ekgqzdX9RVljTrwSqXF7STrNDyeKDrGigphQ/7AS4f2bv5/LF\r
+ Rq7EiZikifCbGOJCGL4PCKFhJiQzoT+VGux5rlzlg7ECg1+e1zNbeT9ved/ZEVFUQCqE\r
+ RGv+MJtQLnz7xumDsw9mSQIeSJgX9tDDMSQ32awEapGAjjyvPD9ZUDak31JTKbWfJxM/\r
+ RB3HJEPJx3UV0IIr/amRqwj79a9FV0dXD54JD2NCxG0+xwVlBBna7AOKiEtSj3smv2ka\r
+ 3gxw==\r
+X-Received: by 10.182.142.229 with SMTP id rz5mr6460217obb.12.1383400986968;\r
+ Sat, 02 Nov 2013 07:03:06 -0700 (PDT)\r
+Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])\r
+ by mx.google.com with ESMTPSA id\r
+ s14sm24761208oeo.1.2013.11.02.07.03.05 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 02 Nov 2013 07:03:06 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 12/21] vim: trivial cleanup\r
+Date: Sat, 2 Nov 2013 07:55:45 -0600\r
+Message-Id: <1383400554-1832-13-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.8.4.2+fc1\r
+In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\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, 02 Nov 2013 14:03:48 -0000\r
+\r
+Using $email_address is more straight forward.\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index cf829a6..9a45300 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -566,7 +566,7 @@ ruby << EOF\r
+ \r
+ f.flush\r
+ \r
+- VIM::command("let s:reply_from='%s'" % reply.from.first.to_s)\r
++ VIM::command("let s:reply_from='%s'" % $email_address)\r
+ VIM::command("call s:new_file_buffer('compose', '#{f.path}')")\r
+ VIM::command("call cursor(#{old_count}, 0)")\r
+ end\r
+-- \r
+1.8.4.2+fc1\r
+\r