-# start mutt, open original folder and jump to the original message
-$MUTT -e "push <change-folder>$orig_maildir<enter><search>\"~i $msgid\"<enter>"
+ # Close message-stdin and open terminal-stdin instead.
+ # mutt behaves different if STDIN is no terminal
+ # TODO: Find cleaner solution (e.g. mutt command-line argument?)
+ exec 0<&-
+ term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')"
+ exec < $term
+
+ # start mutt, open original folder and jump to the original message
+ $MUTT -e "push \"<change-folder>$orig_maildir<enter>$jump_cmd\""
+
+else
+
+ screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
+ declare -a screen_opts
+ if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
+ screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
+ screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
+ fi
+
+ $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X select .
+ $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X stuff ":push \"$jump_cmd\"\r"
+ if [ $? != 0 ] ; then
+ die "You have to manually start a screen session with:
+$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
+ fi
+fi