Use HTML part as main body part in more cases

1 files changed, 5 insertions, 2 deletions

diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 96d890e10..121294fdb 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -893,9 +893,12 @@ class IncomingMessage < ActiveRecord::Base
     def get_main_body_text_part
         leaves = get_attachment_leaves
         
-        # Find first part which is text/plain
+        # Find first part which is text/plain or text/html
+        # (We have to include HTML, as increasingly there are mail clients that
+        # include no text alternative for the main part, and we don't want to
+        # instead use the first text attachment)
         leaves.each do |p|
-            if p.content_type == 'text/plain'
+            if p.content_type == 'text/plain' or p.content_type == 'text/html'
                 return p
             end
         end