diff --git a/includes/mail.inc b/includes/mail.inc
index bbb5535..d53da2d 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -402,7 +402,7 @@ function drupal_html_to_text($string, $allowed_tags = NULL) {
   // Cache list of supported tags.
   static $supported_tags;
   if (empty($supported_tags)) {
-    $supported_tags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr');
+    $supported_tags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'img');
   }
 
   // Make sure only supported tags are kept.
@@ -415,6 +415,9 @@ function drupal_html_to_text($string, $allowed_tags = NULL) {
   $string = preg_replace('!</?(em|i)((?> +)[^>]*)?>!i', '/', $string);
   $string = preg_replace('!</?(strong|b)((?> +)[^>]*)?>!i', '*', $string);
 
+  // Replace images with alternate text
+  $string = preg_replace('@<img[^>]+?alt="([^"]*)"[^>]*?>@i', '$1', $string);
+
   // Replace inline <a> tags with the text of link and a footnote.
   // 'See <a href="http://drupal.org">the Drupal site</a>' becomes
   // 'See the Drupal site [1]' with the URL included as a footnote.