diff -u mutt-1.5.21/debian/changelog mutt-1.5.21/debian/changelog
--- mutt-1.5.21/debian/changelog
+++ mutt-1.5.21/debian/changelog
@@ -1,3 +1,9 @@
+mutt (1.5.21-5ubuntu1~nxvl3) natty; urgency=low
+
+  * Droped ubuntu/lp-693244-autoview patch upstreamed
+
+ -- Nicolas Valcárcel Scerpella <nicolas.valcarcel@canonical.com>  Thu, 12 May 2011 16:44:53 +0200
+
 mutt (1.5.21-5ubuntu1~nxvl2) natty; urgency=low
 
   * Fix typo in control file. 
diff -u mutt-1.5.21/debian/patches/series mutt-1.5.21/debian/patches/series
--- mutt-1.5.21/debian/patches/series
+++ mutt-1.5.21/debian/patches/series
@@ -54,9 +54,6 @@
 upstream/611410-no-implicit_autoview-for-text-html.patch
 upstream/path_max
 
-# Ubuntu cherry-pick from upstream
-ubuntu/lp-693244-autoview
-
 mutt.org
 # extra patches for mutt-patched
 mutt-patched/sidebar
reverted:
--- mutt-1.5.21/debian/patches/ubuntu/lp-693244-autoview
+++ mutt-1.5.21.orig/debian/patches/ubuntu/lp-693244-autoview
@@ -1,12 +0,0 @@
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -658,6 +658,9 @@
-   switch (m->type)
-   {
-     case TYPETEXT:
-+      if (!ascii_strcasecmp ("html", m->subtype))
-+	return 1;
-+
-       /* we can display any text, overridable by auto_view */
-       return 0;
-       break;