diff -ur RT.orig/Attachment_Overlay.pm RT/Attachment_Overlay.pm
--- RT.orig/Attachment_Overlay.pm	2007-10-14 21:16:12.000000000 +0200
+++ RT/Attachment_Overlay.pm	2007-11-02 15:25:30.966409870 +0100
@@ -277,7 +277,7 @@
   my $self = shift;
 
   return $self->Content unless (
-     $self->ContentType =~ qr{^(text/plain|message/rfc822)$}i) ;
+     $self->ContentType =~ qr{^(text/plain|text/html|message/rfc822)$}i) ;
   my $enc = $self->OriginalEncoding;
 
   my $content;
diff -ur RT.orig/I18N.pm RT/I18N.pm
--- RT.orig/I18N.pm	2007-10-14 21:16:12.000000000 +0200
+++ RT/I18N.pm	2007-11-02 15:14:54.029963665 +0100
@@ -208,7 +208,7 @@
 	if $head->mime_attr('content-type.charset') or $head->mime_type =~ /^text/;
 
 
-    return unless ( $head->mime_type =~ qr{^(text/plain|message/rfc822)$}i  );
+    return unless ( $head->mime_type =~ qr{^(text/plain|text/html|message/rfc822)$}i  );
     
 
     my $body = $entity->bodyhandle;
diff -ur RT.orig/Record.pm RT/Record.pm
--- RT.orig/Record.pm	2007-08-14 18:23:38.000000000 +0200
+++ RT/Record.pm	2007-11-02 15:15:53.024097950 +0100
@@ -862,7 +862,7 @@
     elsif ( $ContentEncoding && $ContentEncoding ne 'none' ) {
         return ( $self->loc( "Unknown ContentEncoding [_1]", $ContentEncoding ) );
     }
-    if ( $ContentType eq 'text/plain' ) {
+    if ( $ContentType eq 'text/plain' || $ContentType eq 'text/html' ) {
        $Content = Encode::decode_utf8($Content) unless Encode::is_utf8($Content);
     }
         return ($Content);
