diff -u mutt-1.5.20/debian/control mutt-1.5.20/debian/control
--- mutt-1.5.20/debian/control
+++ mutt-1.5.20/debian/control
@@ -1,7 +1,8 @@
 Source: mutt
 Section: mail
 Priority: standard
-Maintainer: Christoph Berg <myon@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Berg <myon@debian.org>
 Uploaders: Adeodato Simó <dato@net.com.org.es>, Antonio Radici <antonio@dyne.org>
 Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl,
  elinks-lite | elinks, gawk, gettext, libgdbm-dev, libgnutls-dev,
@@ -16,7 +17,7 @@
 Package: mutt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: exim4 | mail-transport-agent, locales, mime-support, libsasl2-modules, 
+Recommends: default-mta | mail-transport-agent, locales, mime-support, libsasl2-modules, 
  libgpgme11
 Suggests: urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates
 Provides: mail-reader, imap-client
diff -u mutt-1.5.20/debian/changelog mutt-1.5.20/debian/changelog
--- mutt-1.5.20/debian/changelog
+++ mutt-1.5.20/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.5.20-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #392997), remaining changes:
+    debian/control: Recommend default-mta instead of exim4.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@users.sourceforge.net>  Sat, 27 Jun 2009 23:52:24 +0300
+
 mutt (1.5.20-2) unstable; urgency=low
 
   [ Antonio Radici ]
@@ -29,6 +36,14 @@
 
  -- Christoph Berg <myon@debian.org>  Sat, 20 Jun 2009 15:00:50 +0200
 
+mutt (1.5.20-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #388515)
+  * Build-depend on elinks-lite (elinks doesn't provide links anymore).
+  * debian/control: Recommend default-mta instead of exim4.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@users.sourceforge.net>  Wed, 17 Jun 2009 17:17:28 +0300
+
 mutt (1.5.20-1) unstable; urgency=low
 
   * New upstream release, includes the following features:
@@ -57,6 +72,13 @@
 
  -- Antonio Radici <antonio@dyne.org>  Sun, 14 Jun 2009 20:53:18 +0100
 
+mutt (1.5.19-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #384499
+    - Build-depend on elinks (elinks doesn't provide links anymore).
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 07 Jun 2009 17:30:03 +0530
+
 mutt (1.5.19-4) unstable; urgency=low
 
   * debian/rules:
@@ -152,6 +174,45 @@
 
  -- Christoph Berg <myon@debian.org>  Thu, 15 Jan 2009 23:47:29 +0100
 
+mutt (1.5.18-6ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #326196
+    - Build-depend on elinks (elinks doesn't provide links anymore).
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Fri, 06 Feb 2009 20:27:21 +0530
+
+mutt (1.5.18-6) unstable; urgency=high
+
+  * Grab from upstream:
+    + Guard idata->mailbox read in imap_mailbox_state.
+      The bug happens when a user has more than a imap mailbox, when
+      he/she browses through them mutt will segfault.
+      (Closes: #462266, #513230, #514309. Mutt: #3057)
+
+ -- Christoph Berg <myon@debian.org>  Sun, 08 Feb 2009 20:46:34 +0100
+
+mutt (1.5.18-5) unstable; urgency=high
+
+  * Grab two patches from upstream:
+    + Always sort inode list for accessing header cache. (Closes: #508988)
+      Otherwise, the disks seeks to death while reading the header cache file.
+      Affects all filesystems where directories store inodes in random order.
+      (e.g. ext3)
+    + Delete partially downloaded files in message cache. (Closes: #500016)
+      Otherwise, network problems would leave invalid cache files (most often
+      empty) behind.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 05 Feb 2009 23:55:53 +0100
+
+mutt (1.5.18-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build-depend on elinks (elinks doesn't provide links anymore).
+  * Fixes unread mail count with local Maildir folders in the sidebar. (LP:
+    #251785)
+
+ -- Soren Hansen <soren@ubuntu.com>  Thu, 07 Aug 2008 10:29:06 +0200
+
 mutt (1.5.18-4) unstable; urgency=low
 
   * In order to evade a conflict with the sidebar patch, move the set_xterm_*
@@ -174,6 +235,13 @@
 
  -- Christoph Berg <myon@debian.org>  Sun, 20 Jul 2008 01:35:03 +0200
 
+mutt (1.5.18-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build-depend on elinks (elinks doesn't provide links anymore).
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Jun 2008 10:29:06 +0200
+
 mutt (1.5.18-2) unstable; urgency=low
 
   * Updated sidebar patch, does not display (NULL) anymore. (Closes: #483151)
@@ -203,6 +271,13 @@
 
  -- Christoph Berg <myon@debian.org>  Sat, 24 May 2008 19:36:44 +0200
 
+mutt (1.5.17+20080114-1ubuntu1) hardy; urgency=low
+
+  * Build-depend on elinks (elinks doesn't provide links anymore).
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Apr 2008 20:16:41 +0000
+
 mutt (1.5.17+20080114-1) unstable; urgency=low
 
   * New upstream snapshot (hg 130aa0517251), and this time build a proper