Merge branch 'master' into screen-git

Conflicts:
	muttjump

diff --cc muttjump
index ab438007b46c3967ab6a9cff4a2f84d714e6bb4f,cd1b0062099eae5bcf685e42f7980ecc772f8415..8ba8e0274bb4ae2bbe0f206fdbfcb13672ec8e97
--- 1/muttjump
--- 2/muttjump
+++ b/muttjump
@@@ -196,11 -207,8 +207,12 @@@ if [ ! -d "$orig_maildir/cur" ] ; the
      die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
  fi
  
- jump_expr="~i'$msgid'"
+ msgid_mutt=$(quote_regexp "$msgid_quoted")
+ jump_expr="~i'$msgid_mutt'"
 +jump_cmd="<limit>$jump_expr<enter>"
 +if [ "$MUTTJUMP_MODE" = search ] ; then
 +    jump_cmd="$jump_cmd<limit>all<enter>"
 +fi
  
  if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then