Merge branch 'thread-by-subj-fix' into next

Conflicts:

	lib/sup/index.rb

diff --cc lib/sup/index.rb
index 38ca4c3ac8bb69a297016897fc068917e3dc43ae,c8c5c26e1ec2372971323758023449a98c03c6c2..f1ede5538a2b7f3793b9ec5c946b3cb5df384e2b
--- 1/lib/sup/index.rb
--- 2/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@@ -219,14 -186,14 +219,14 @@@ EO
        :message_id => m.id,
        :source_id => source_id,
        :source_info => m.source_info,
 -      :date => m.date.to_indexable_s,
 -      :body => m.indexable_content,
 -      :snippet => snippet,
 -      :label => m.labels.uniq.join(" "),
 -      :from => m.from ? m.from.indexable_content : "",
 -      :to => (m.to + m.cc + m.bcc).map { |x| x.indexable_content }.join(" "),
 -      :subject => wrap_subj(Message.normalize_subj(m.subj)),
 -      :refs => (m.refs + m.replytos).uniq.join(" "),
 +      :date => (entry[:date] || m.date.to_indexable_s),
 +      :body => (entry[:body] || m.indexable_content),
 +      :snippet => snippet, # always override
 +      :label => labels.uniq.join(" "),
 +      :from => (entry[:from] || (m.from ? m.from.indexable_content : "")),
 +      :to => (entry[:to] || (m.to + m.cc + m.bcc).map { |x| x.indexable_content }.join(" ")),
-       :subject => (entry[:subject] || wrap_subj(m.subj)),
++      :subject => (entry[:subject] || wrap_subj(Message.normalize_subj(m.subj))),
 +      :refs => (entry[:refs] || (m.refs + m.replytos).uniq.join(" ")),
      }
  
      @index.delete docid if docid