Merge branch 'master' into next

Conflicts:

	lib/sup/modes/thread-index-mode.rb

diff --cc lib/sup/modes/thread-index-mode.rb
index 897dca7b5b639fe7d306ead3a4241a89f93c7405,9b44ee35c7ee2d6091b6dc5b0a82aec98b8dfb21..0bd8110fa7cb4824b8f70dc298409c4a59a3cb30
--- 1/lib/sup/modes/thread-index-mode.rb
--- 2/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@@ -565,10 -565,9 +565,10 @@@ EO
            t.remove_label l
          else
            t.apply_label l
+           LabelManager << l
          end
-         LabelManager << l
        end
 +      UpdateManager.relay self, :labeled, t.first
      end
  
      regen_text