Merge branch 'stable'

40 files changed, 66 insertions, 627 deletions

diff --git a/.gitignore b/.gitignore
index 44f18caa..2ca48355 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@
 /config.status
 /configure
 /hcachever.sh
-/muttbug.sh
 /stamp-h1
 /doc/Muttrc
 /doc/instdoc.sh
@@ -28,7 +27,6 @@
 /mkinstalldirs
 
 # built objects
-/flea
 /hcversion.h
 /keymap_defs.h
 /keymap_alldefs.h
diff --git a/Makefile.am b/Makefile.am
index 88698b85..83d347cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ endif
 
 SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
 
-bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+bin_SCRIPTS = $(SMIMEAUX_TARGET)
 
 if BUILD_HCACHE
 HCVERSION = hcversion.h
@@ -74,7 +74,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
 	mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \
 	README.SSL smime.h group.h \
-	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
+	pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
 	ChangeLog mkchangelog.sh mutt_idna.h sidebar.h OPS.SIDEBAR \
 	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \
 	txt2c.c txt2c.sh version.sh check_sec.sh
@@ -116,16 +116,12 @@ conststrings.c: txt2c config.status
 
 CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
 
-DISTCLEANFILES= flea smime_keys txt2c po/$(PACKAGE).pot
+DISTCLEANFILES= smime_keys txt2c po/$(PACKAGE).pot
 
 ACLOCAL_AMFLAGS = -I m4
 
 LDADD = $(LIBOBJS) $(INTLLIBS)
 
-flea:	muttbug.sh
-	cp muttbug.sh flea
-	chmod +x flea
-
 smime_keys: $(srcdir)/smime_keys.pl
 	cp $(srcdir)/smime_keys.pl smime_keys
 	chmod +x smime_keys
diff --git a/configure.ac b/configure.ac
index 168d1dd9..7034f869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1458,5 +1458,5 @@ fi
 
 AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile
         intl/Makefile m4/Makefile po/Makefile.in
-        hcachever.sh muttbug.sh doc/instdoc.sh)
+        hcachever.sh doc/instdoc.sh)
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bc8f856d..4c0f89d1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,6 @@ noinst_PROGRAMS = makedoc
 
 EXTRA_DIST = dotlock.man		\
         smime_keys.man                  \
-	muttbug.man			\
 	mutt.man			\
 	pgpewrap.man			\
 	pgpring.man			\
@@ -61,8 +60,6 @@ install-data-local: makedoc-all instdoc
 	./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
 	./instdoc pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
 	./instdoc pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
-	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
-	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
 	test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \
 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
@@ -89,7 +86,7 @@ install-data-local: makedoc-all instdoc
 	fi
 
 uninstall-local:
-	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+	for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
 		rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
 	done
 	for f in muttrc.5 mbox.5 mmdf.5 ; do \
diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 2a17ca69..4f585988 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -92,8 +92,8 @@ url="http://www.mutt.org/download.html">http://www.mutt.org/download.html</ulink
 </para>
 
 <para>
-For nightly tarballs and version control access, please refer to the
-<ulink url="http://dev.mutt.org/">Mutt development site</ulink>.
+For version control access, please refer to the
+<ulink url="https://gitlab.com/muttmua/mutt">Mutt development site</ulink>.
 </para>
 
 </sect1>
@@ -108,7 +108,7 @@ For nightly tarballs and version control access, please refer to the
 <listitem>
 <para>
 The official Mutt bug tracking system can be found at
-<ulink url="http://bugs.mutt.org/">http://bugs.mutt.org/</ulink>
+<ulink url="https://gitlab.com/muttmua/mutt/issues">https://gitlab.com/muttmua/mutt/issues</ulink>
 </para>
 </listitem>
 </varlistentry>
diff --git a/doc/mutt.man b/doc/mutt.man
index d29294fd..dc02ab72 100644
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -211,7 +211,7 @@ The help line for the index menu is not updated if you change the bindings
 for one of the functions listed while Mutt is running.
 .PP
 For a more up-to-date list of bugs, errm, fleas, please visit the
-mutt project's bug tracking system under http://bugs.mutt.org/.
+mutt project's bug tracking system under https://gitlab.com/muttmua/mutt/issues.
 .SH NO WARRANTIES
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/doc/muttbug.man b/doc/muttbug.man
deleted file mode 100644
index 6b71c994..00000000
--- a/doc/muttbug.man
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" -*-nroff-*-
-.\"
-.\"
-.\"     Copyright (C) 1996-2000 Thomas Roessler <roessler@does-not-exist.org>
-.\" 
-.\"     This program is free software; you can redistribute it and/or modify
-.\"     it under the terms of the GNU General Public License as published by
-.\"     the Free Software Foundation; either version 2 of the License, or
-.\"     (at your option) any later version.
-.\" 
-.\"     This program is distributed in the hope that it will be useful,
-.\"     but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\"     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\"     GNU General Public License for more details.
-.\" 
-.\"     You should have received a copy of the GNU General Public License
-.\"     along with this program; if not, write to the Free Software
-.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-.\"
-.TH flea 1 "July 2000" Unix "User Manuals"
-.SH NAME
-flea \- Report a bug (or rather a flea) in mutt.
-.SH SYNOPSIS
-.PP
-.B flea
-.SH DESCRIPTION
-.PP
-.B flea
-is a shell script which helps you to submit a bug report against the 
-.BR mutt (1)
-mail user agent.
-.PP
-If you invoke 
-.BR flea , 
-you'll first be prompted for a short
-description of the problem you experience.  This will be used as the
-bug report's subject line, so it should be concise, but informative.
-.PP
-You are then asked to assign an initial severity level to the
-problem you observe; 
-.B flea
-will give you a description which severity level is appropriate or
-not.
-.PP
-Then, you are asked for the location of a core dump (normally named
-.BR core )
-which may have been left over by a crash of your 
-.BR mutt (1).
-You can just type \(lqno\(rq here, or you can enter the path leading 
-to a core dump.
-.B flea
-will try to use either
-.BR sdb (1),
-.BR dbx (1),
-or
-.BR gdb (1)
-to extract some information from this core dump which may be helpful
-to developers in order to determine the reason for the crash.
-.PP
-Finally, you are asked whether or not you want to include personal
-and system 
-.BR mutt (1)
-configuration files with the bug report.  If at all possible, we
-urge you to answer these questions with \(lqyes\(rq, since a
-reference configuration makes it incredibly easier to track down a
-problem.
-.PP
-If you are using Debian GNU/Linux,
-.B flea
-will now check whether or not 
-.B mutt
-has been installed as a Debian
-package on your system, and suggest to file the bug against the
-.BR mutt (1)
-and Debian bug tracking systems.  This option was added since the 
-.BR mutt (1)
-project uses another instantiation of the Debian bug tracking
-system, so submitting bugs against both systems in one pass is
-simple.
-.PP
-You are then dropped into your favorite editor as determined by the 
-.B EDITOR
-and
-.B VISUAL
-environment variables.  
-.PP
-Please give us details about the problem in the empty space below
-the line reading \(lqPlease type your report below this line\(rq.
-We are most interested in precise information on what symptoms you
-observe and what steps may be used to reproduce the bug.  Chances
-are that problems which can easily be reproduced will be fixed
-quickly.  So please take some time when filling out this part of the
-template.
-.PP
-The remainder of the template contains various kinds of information
-gathered from your system, including output of the
-.BR uname (1)
-command, output from
-.BR mutt (1)
-itself, and your system's 
-.BR mutt (1)
-configuration files.  You may wish to browse through this part of
-the bug report form in order to avoid leaking confidential
-information to the public.
-.PP
-If you leave the editor, 
-.B flea
-will give you the option to review, re-edit, submit, or abandon your
-bug report.  If you decide to submit it, a mail message containing
-your report will be sent to <fleas@mutt.org>.  You'll receive a
-copy of this message.
-.PP
-While your bug report is being processed by the bug tracking system,
-you will receive various e-mail messages from the bug tracking
-system informing you about what's going on: Once your bug report has
-been entered into the bug tracking system, it will be assigned a
-unique serial number about which you are informed via e-mail.  If
-you wish to submit additional information about the bug, you can
-just send it to the address
-.BR fleas@mutt.org
-with #\fIserial\fP in the subject.
-.PP
-Later, you will most likely receive questions from the developers
-about the problem you observed, and you will eventually be informed
-that your bug report has been closed.  This means that the bug has
-been fixed at least in the
-.BR hg (1)
-repository.  If the answers you receive don't satisfy you, don't
-hesitate to contact the developers directly under
-.BR mutt-dev@mutt.org.
-.PP
-You can also browse your bug report and all additional information
-and replies connected to it using the bug tracking system's Web
-interface under the following URL:
-http://bugs.mutt.org/
-.SH
-ENVIRONMENT
-.PP
-.B flea
-will use the following environment variables:
-.IP "EMAIL"
-Your electronic mail address.  Will be used to set the bug report's
-From header, and to send you a copy of the report.
-.IP "LOGNAME"
-Your login name.  If the
-.B EMAIL
-environment variable isn't set, this will be used instead to send
-you a copy of the report.  Setting the sender will be left to 
-.BR sendmail (1)
-on your system.
-.IP "REPLYTO"
-If set, the bug report will contain a Reply-To header with the
-e-mail address contained in this environment variable.
-.IP "ORGANIZATION"
-If set, the bug report will contain an Organization header with the
-contents of this environment variable.
-.IP "PAGER"
-If set, this environment variable will be expected to contain the
-path to your favorite pager for viewing the bug report.  If unset, 
-.BR more (1)
-will be used.
-.IP "VISUAL"
-If set, this environment variable will be expected to contain the
-path to your favorite visual editor.
-.IP "EDITOR"
-If set, this environment variable will be expected to contain the
-path to your favorite editor.  This variable is examined if and only
-if the 
-.B VISUAL
-environment variable is unset.  If
-.B EDITOR
-is unset, 
-.BR vi (1)
-will be used to edit the bug report.
-.SH
-FILES
-.PP
-.IP "core"
-If present, this file may contain a post-mortem memory dump of mutt.
-It will be inspected using the debugger installed on your system.
-.SH 
-SEE ALSO
-.PP
-.BR dbx (1),
-.BR gdb (1),
-.BR lynx (1),
-.BR mutt (1),
-.BR muttrc (5),
-.BR sdb (1),
-.BR sendmail (1),
-.BR uname (1),
-.BR vi (1)
-.PP
-The mutt bug tracking system: http://bugs.mutt.org/
-.SH
-AUTHOR
-.PP
-.B flea
-and this manual page were written by Thomas Roessler
-<roessler@does-not-exist.org>.
diff --git a/init.c b/init.c
index f15a3719..1a86182c 100644
--- a/init.c
+++ b/init.c
@@ -3521,18 +3521,6 @@ void mutt_init (int skip_sys_rc, LIST *commands)
    */
   add_to_list(&MailtoAllow, "body");
   add_to_list(&MailtoAllow, "subject");
-  
-  
-  
-  /*
-   * 
-   *			   BIG FAT WARNING
-   * 
-   * When changing the code which looks for a configuration file,
-   * please also change the corresponding code in muttbug.sh.in.
-   * 
-   * 
-   */
 
   if (!Muttrc)
   {
diff --git a/main.c b/main.c
index 8db6889f..3fbb1894 100644
--- a/main.c
+++ b/main.c
@@ -67,7 +67,7 @@
 
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-dev@mutt.org>.\n\
-To report a bug, please visit http://bugs.mutt.org/.\n");
+To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2016 Michael R. Elkins and others.\n\
diff --git a/muttbug b/muttbug
deleted file mode 100755
index e94d8cdd..00000000
--- a/muttbug
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec flea "$@"
diff --git a/muttbug.sh.in b/muttbug.sh.in
deleted file mode 100644
index 53d9de4d..00000000
--- a/muttbug.sh.in
+++ /dev/null
@@ -1,337 +0,0 @@
-#!/bin/sh
-
-#
-#     File a bug against the Mutt mail user agent.
-#
-
-# 
-#     $Id$
-#
-
-#
-#     Copyright (c) 2000 Thomas Roessler <roessler@does-not-exist.org>
-#
-#
-#     This program is free software; you can redistribute it and/or modify
-#     it under the terms of the GNU General Public License as published by
-#     the Free Software Foundation; either version 2 of the License, or
-#     (at your option) any later version.
-# 
-#     This program is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#     GNU General Public License for more details.
-# 
-#     You should have received a copy of the GNU General Public License
-#     along with this program; if not, write to the Free Software
-#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-SUBMIT="fleas@mutt.org"
-DEBIAN_SUBMIT="submit@bugs.debian.org"
-
-prefix=@prefix@
-
-DEBUGGER=@DEBUGGER@
-SENDMAIL=@SENDMAIL@
-sysconfdir=@sysconfdir@
-pkgdatadir=@pkgdatadir@
-
-include_file ()
-{
-	echo
-	echo "--- Begin $1"
-	sed -e '/^[	 ]*#/d; /^[	 ]*$/d; s/^-/- -/' $1
-	echo "--- End $1"
-	echo
-}
-
-debug_gdb ()
-{
-	cat << EOF > $SCRATCH/gdb.rc
-bt
-list
-quit
-EOF
-	$DEBUGGER -n -x $SCRATCH/gdb.rc -c $CORE mutt
-}
-
-debug_dbx ()
-{
-	cat << EOF > $SCRATCH/dbx.rc
-where
-list
-quit
-EOF
-	$DEBUGGER -s $SCRATCH/dbx.rc mutt $CORE
-}
-
-debug_sdb ()
-{
-	cat << EOF > $SCRATCH/sdb.rc
-t
-w
-q
-EOF
-	$DEBUGGER mutt $CORE < $SCRATCH/sdb.rc
-}
-
-case `echo -n` in
-"") n=-n; c=   ;;
- *) n=; c='\c' ;;
-esac
- 
-
-exec > /dev/tty
-exec < /dev/tty
-
-SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$
-
-mkdir ${SCRATCH} || \
-{ 
-	echo "`basename $0`: Can't create temporary directory." >& 2 ; 
-	exit 1 ; 
-}
-
-trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2
-
-TEMPLATE=${SCRATCH}/template.txt
-
-if test -z "$EMAIL" ; then
-	EMAIL="`mutt -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`"
-fi
-
-EMAILTMP=''
-while test -z "$EMAILTMP"
-do
-  echo "Please enter your e-mail address [$EMAIL]:"
-  echo $n "> $c"
-  read EMAILTMP
-
-  if test -z "$EMAILTMP"; then EMAILTMP="$EMAIL"; fi
-
-  if ! echo "$EMAILTMP" | grep -q @
-  then
-    echo "$EMAILTMP does not appear to be a valid email address"
-    EMAILTMP=''
-    continue
-  fi
-
-  EMAIL="$EMAILTMP"
-done
-
-echo "Please enter a one-line description of the problem you experience:"
-echo $n "> $c"
-read SUBJECT
-
-cat <<EOF  
-What should the severity for this bug report be?
-
-       0) Feature request, or maybe a bug which is very difficult to
-       fix due to major design considerations.
-
-       1) The package fails to perform correctly in some conditions,
-       or on some systems, or fails to comply with current policy
-       documents. Most bugs are in this category.
-
-       2) This bug makes this version of the package unsuitable for
-       a stable release.
-
-       3) Dangerous bug. Makes the package in question unusable by
-       anyone or mostly so, or causes data loss, or introduces a
-       security hole allowing access to the accounts of users who
-       use the package.
-
-       4) Critical bug. Makes unrelated software on the system (or
-       the whole system) break, or causes serious data loss, or
-       introduces a security hole on systems where you install the
-       package.
-
-EOF
-echo $n "Severity? [01234] $c"
-read severity
-case "$severity" in
-0|[Ww]) severity=wishlist  ;;
-2|[Ii]) severity=important ;;
-3|[Gg]) severity=grave     ;;
-4|[Cc]) severity=critical  ;;
-     *) severity=normal    ;;
-esac
-
-if test -x $DEBUGGER ; then
-	test -f core && CORE=core
-	echo "If mutt has crashed, it may have saved some program state in"
-	echo "a file named core.  We can include this information with the bug"
-	echo "report if you wish so."
-	echo "Do you want to include information gathered from a core file?"
-	echo "If yes, please enter the path - otherwise just say no: [$CORE]"
-	echo $n "> $c"
-	read _CORE
-	test "$_CORE" && CORE="$_CORE"
-fi
-
-echo $n "Do you want to include your personal mutt configuration files? [Y|n] $c"
-read personal
-case "$personal" in
-[nN]*)  personal=no  ;;
-    *)  personal=yes ;;
-esac
-
-echo $n "Do you want to include your system's global mutt configuration file? [Y|n] $c"
-read global
-case "$global" in
-[nN]*)  global=no  ;;
-    *)	global=yes ;;
-esac
-
-if test -f /etc/debian_version ; then
-	DEBIAN=yes
-	echo $n "Checking whether mutt has been installed as a package... $c"
-	DEBIANVERSION="`dpkg -l mutt | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
-	if test "$DEBIANVERSION" ; then
-		DPKG=yes
-	else
-		DPKG=no
-		unset DEBIANVERSION
-	fi
-	echo "$DPKG"
-	echo $n "File this bug with Debian? [Y|n] $c"
-	read DPKG
-	case "$DPKG" in
-	[nN])	DPKG=no ;;
-	*)	DPKG=yes ;;
-	esac
-else
-	DEBIAN=no
-	DPKG=no
-fi
-
-if rpm -q mutt > /dev/null 2> /dev/null ; then
-	echo "Mutt seems to come from an RPM package."
-	RPMVERSION="`rpm -q mutt`"
-	RPMPACKAGER="`rpm -q -i mutt | sed -n -e 's/^Packager *: *//p'`"
-fi
-
-MUTTVERSION="`mutt -v | awk '{print $2; exit; }'`"
-test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
-
-exec > ${TEMPLATE}
-
-test "$EMAIL"        && echo "From: $EMAIL"
-test "$REPLYTO"      && echo "Reply-To: $REPLYTO"
-test "$ORGANIZATION" && echo "Organization: $ORGANIZATION"
-
-echo "Subject: mutt-$MUTTVERSION: $SUBJECT"
-echo "To: $SUBMIT"
-test "$EMAIL" 	     && echo "Bcc: ${EMAIL}"
-echo
-echo "Package: mutt"
-echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
-echo "Severity: $severity"
-echo 
-echo "-- Please type your report below this line"
-echo
-echo
-echo
-
-if test "$DEBIAN" = "yes" ; then
-	echo "Obtaining Debian-specific information..." > /dev/tty
-	bug -p -s dummy mutt < /dev/null 2> /dev/null |        \
-		sed -n -e "/^-- System Information/,/^---/p" | \
-		grep -v '^---'
-else
-	echo "-- System Information"
-	echo "System Version: `uname -a`"
-	test -z "$RPMPACKAGER" || echo "RPM Packager: $RPMPACKAGER";
-	test -f /etc/redhat-release && echo "RedHat Release: `cat /etc/redhat-release`"
-	test -f /etc/SuSE-release && echo "SuSE Release: `sed 1q /etc/SuSE-release`"
-	# Please provide more of these if you have any.
-fi
-
-echo
-echo "-- Mutt Version Information"
-echo
-LC_ALL=C mutt -v
-
-if test "$CORE" && test -f "$CORE" ; then
-	echo 
-	echo "-- Core Dump Analysis Output"
-	echo
-
-	case "$DEBUGGER" in
-		*sdb) debug_sdb $CORE ;;
-		*dbx) debug_dbx $CORE ;;
-		*gdb) debug_gdb $CORE ;;
-	esac
-	
-	echo
-fi
-
-if test "$personal" = "yes" ; then
-	xdg_cfg_home=${XDG_CONFIG_HOME:-${HOME}/.config}
-	CANDIDATES="muttrc-${MUTTVERSION} muttrc"
-	DIRECTORIES="${HOME}/. ${HOME}/.mutt/ $xdg_cfg_home/mutt/"
-	MATCHED="none"
-	for d in $DIRECTORIES ; do
-		for f in $CANDIDATES; do
-			if test -f ${d}${f} ; then
-				MATCHED="${d}${f}"
-				break
-			fi
-		done
-		test "$MATCHED" = "none" || break
-	done
-	
-	if test "$MATCHED" = "none" ; then
-		echo "Warning: Can't find your personal .muttrc." >&2
-	else
-		include_file $MATCHED
-	fi
-fi
-
-
-if test "$global" = "yes" ; then
-	CANDIDATES="Muttrc-${MUTTVERSION} Muttrc"
-	DIRECTORIES="$sysconfdir $pkgdatadir"
-	MATCHED="none"
-	for d in $DIRECTORIES ; do
-		for f in $CANDIDATES; do
-			if test -f $d/$f ; then
-				MATCHED="$d/$f"
-				break
-			fi
-		done
-		test "$MATCHED" = "none" || break
-	done
-	
-	if test "$MATCHED" = "none" ; then
-		echo "Warning: Can't find global Muttrc." >&2
-	else
-		include_file $MATCHED
-	fi
-fi
-
-exec > /dev/tty
-
-cp $TEMPLATE $SCRATCH/mutt-bug.txt
-
-input="e"
-while : ; do
-	if test "$input" = "e" ; then
-		${VISUAL-${EDITOR-vi}} $SCRATCH/mutt-bug.txt
-		if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then
-			echo "Warning: Bug report was not modified!"
-		fi
-	fi
-	
-	echo $n "Submit, Edit, View, Quit? [S|e|v|q] $c"
-	read _input
-	input="`echo $_input | tr EVSQ evsq`"
-	case $input in
-	e*)	;;
-	v*)	${PAGER-more} $SCRATCH/mutt-bug.txt ;;
-	s*|"")	$SENDMAIL -t < $SCRATCH/mutt-bug.txt ; exit ;;
-	q*)	exit
-	esac
-done
-
diff --git a/po/bg.po b/po/bg.po
index 4759c9ab..5f59e7f4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2954,10 +2954,10 @@ msgstr "������������ �����!"
 #, fuzzy
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please visit http://bugs.mutt.org/.\n"
+"To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n"
 msgstr ""
 "�� ������� � �������������, ���� ��������� ����� �� <mutt-dev@mutt.org>.\n"
-"�� �� �������� �� ������, ���� ����������� ������� flea(1).\n"
+"�� �� �������� �� ������, ���� ����������� ������� https://gitlab.com/muttmua/mutt/issues.\n"
 
 #: main.c:72
 #, fuzzy
diff --git a/po/ca.po b/po/ca.po
index 17eb82b6..171da0b3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3060,11 +3060,11 @@ msgstr "No resta memòria."
 #: main.c:68
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please visit http://bugs.mutt.org/.\n"
+"To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n"
 msgstr ""
 "Per a contactar amb els desenvolupadors, per favor envieu un missatge de\n"
 "correu a <mutt-dev@mutt.org>.  Per a informar d’un error, per favor visiteu\n"
-"http://bugs.mutt.org/.  Si teniu observacions sobre la traducció, contacteu\n"
+"https://gitlab.com/muttmua/mutt/issues.  Si teniu observacions sobre la traducció, contacteu\n"
 "amb Ivan Vilata i Balaguer <ivan@selidor.net>.\n"
 
 #: main.c:72
diff --git a/po/cs.po b/po/cs.po
index 82ee0a29..d24c2686 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2860,11 +2860,11 @@ msgstr "Paměť vyčerpána!"
 #: main.c:68
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please visit http://bugs.mutt.org/.\n"
+"To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n"
 msgstr ""
 "Vývojáře programu můžete kontaktovat na adrese <mutt-dev@mutt.org> "
 "(anglicky).\n"
-"Chcete-li oznámit chybu v programu, navštivte http://bugs.mutt.org/.\n"
+"Chcete-li oznámit chybu v programu, navštivte https://gitlab.com/muttmua/mutt/issues.\n"
 "Připomínky k překladu (česky) zasílejte na adresu\n"
 "<translation-team-cs@lists.sourceforge.net>.\n"
 
diff --git a/po/da.po b/po/da.po
index dc5f7b3c..d2f534de 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2829,10 +2829,10 @@ msgstr "Ikke mere hukommelse!"
 #: main.c:68
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please visit http://bugs.mutt.org/.\n"
+"To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n"
 msgstr ""
 "For at kontakte Mutts udviklere, skriv venligst til <mutt-dev@mutt.org>.\n"
-"Besøg netstedet http://bugs.mutt.org/, hvis du vil rapportere en "
+"Besøg netstedet https://gitlab.com/muttmua/mutt/issues, hvis du vil rapportere en "
 "programfejl.\n"
 
 #: main.c:72
diff --git a/po/de.po b/po/de.po
index e0d895b6..ea88122a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2845,11 +2845,11 @@ msgstr "Kein Speicher verfügbar!"
 #: main.c:68
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please visit http://bugs.mutt.org/.\n"
+"To report a bug, please visit https://gitlab.com/muttmua/mutt/issues.\n"
 msgstr ""
 "Um die Entwickler zu kontaktieren, schicken Sie bitte\n"
 "eine Nachricht (in englisch) an <mutt-dev@mutt.org>.\n"
-"Um einen Bug zu melden, besuchen Sie bitte http://bugs.mutt.org/.\n"
+"Um einen Bug zu melden, besuchen Sie bitte https://gitlab.com/muttmua/mutt/issues.\n"
 
 #: main.c:72
 msgid ""
diff --git a/po/el.po b/po/el.po
index 06836a84..550d3c55 100644
--- a/po/el.po
+++ b/