Index: mail/notmuch/Makefile
===================================================================
--- mail/notmuch/Makefile
+++ mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.24.1
+PORTVERSION=	0.24.2
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
Index: mail/notmuch/distinfo
===================================================================
--- mail/notmuch/distinfo
+++ mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494281277
-SHA256 (notmuch-0.24.1.tar.gz) = fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3
-SIZE (notmuch-0.24.1.tar.gz) = 709190
+TIMESTAMP = 1500399569
+SHA256 (notmuch-0.24.2.tar.gz) = aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
+SIZE (notmuch-0.24.2.tar.gz) = 709272
Index: mail/notmuch/files/patch-emacs_notmuch-emacs-mua
===================================================================
--- /dev/null
+++ mail/notmuch/files/patch-emacs_notmuch-emacs-mua
@@ -0,0 +1,35 @@
+--- emacs/notmuch-emacs-mua.orig	2017-07-18 20:34:56 UTC
++++ emacs/notmuch-emacs-mua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # notmuch-emacs-mua - start composing a mail on the command line
+ #
+@@ -26,8 +26,8 @@ set -eu
+ # calling convention: escape -v var "$arg" (like in bash printf).
+ escape ()
+ {
+-    local __escape_arg__=${3//\\/\\\\}
+-    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
++    __escape_arg__="$(printf '%s' "$3" | sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g')"
++    eval "$2=\$__escape_arg__"
+ }
+ 
+ EMACS=${EMACS:-emacs}
+@@ -150,14 +150,14 @@ if [ -n "${MAILTO}" ]; then
+ 	exit 1
+     fi
+     ELISP="(browse-url-mail \"${MAILTO}\")"
+-elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
++elif [ -z "${ELISP}" ] && [ -n "${HELLO}" ]; then
+     ELISP="(notmuch)"
+ else
+     ELISP="(notmuch-mua-new-mail) ${ELISP}"
+ fi
+ 
+ # Kill the terminal/frame if we're creating one.
+-if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then
++if [ -z "$USE_EMACSCLIENT" ] || [ -n "$CREATE_FRAME" ] || [ -n "$NO_WINDOW" ]; then
+     ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
+ fi
Index: mail/notmuch/pkg-plist
===================================================================
--- mail/notmuch/pkg-plist
+++ mail/notmuch/pkg-plist
@@ -1,4 +1,5 @@
 bin/notmuch
+%%EMACS%%bin/notmuch-emacs-mua
 %%MUTT%%bin/notmuch-mutt
 include/notmuch.h
 lib/libnotmuch.so
@@ -30,6 +31,8 @@
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.el
@@ -65,4 +68,5 @@
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
+%%EMACS%%share/applications/notmuch-emacs-mua.desktop
 %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch