Merge branch 'xapian-updates' into next

diff --cc lib/sup/xapian_index.rb
index dbf66431bc263ada5420b9a981f766c9ca5675d4,87a54416d3a5cff2adce7a6f0b01da9c1748d8ec..85f6ef09d3179ac6dd73672b27544c38e20ad28c
--- 1/lib/sup/xapian_index.rb
--- 2/lib/sup/xapian_index.rb
+++ b/lib/sup/xapian_index.rb
@@@ -87,12 -92,8 +92,12 @@@ class XapianIndex < BaseInde
        m
    end
  
 +  def add_message m; sync_message m end
 +  def update_message m; sync_message m end
 +  def update_message_state m; sync_message m end
 +
    def sync_message m, opts={}
-     entry = synchronize { @entries[m.id] }
+     entry = synchronize { get_entry m.id }
      snippet = m.snippet
      entry ||= {}
      labels = m.labels
@@@ -114,12 -115,10 +119,10 @@@
        :replytos => (entry[:replytos] || m.replytos),
      }
  
 -    m.labels.each { |l| LabelManager << l }
 +    labels.each { |l| LabelManager << l }
  
      synchronize do
-       index_message m, opts
-       union_threads([m.id] + m.refs + m.replytos)
-       @entries[m.id] = d
+       index_message m, d, opts
      end
      true
    end