Merge branch 'scanning-speedups' into next

diff --combined lib/sup/modes/edit-message-mode.rb
index 9bd2d498a4b94819b5d9ae161b58460fba970c71,3124bac2d1841821ecdf8329c251d009db97c554..c91827938bbbbe0ef104d48cf02ff924af9e10f2
--- 1/lib/sup/modes/edit-message-mode.rb
--- 2/lib/sup/modes/edit-message-mode.rb
+++ b/lib/sup/modes/edit-message-mode.rb
@@@ -12,7 -12,7 +12,7 @@@ class EditMessageMode < LineCursorMod
  
    FORCE_HEADERS = %w(From To Cc Bcc Subject)
    MULTI_HEADERS = %w(To Cc Bcc)
-   NON_EDITABLE_HEADERS = %w(Message-Id Date)
+   NON_EDITABLE_HEADERS = %w(Message-id Date)
  
    HookManager.register "signature", <<EOS
  Generates a message signature.
@@@ -145,8 -145,6 +145,8 @@@ EO
      !edited? || BufferManager.ask_yes_or_no("Discard message?")
    end
  
 +  def unsaved?; edited? end
 +
    def attach_file
      fn = BufferManager.ask_for_filename :attachment, "File name (enter for browser): "
      return unless fn
@@@ -392,7 -390,7 +392,7 @@@ protecte
  
        contacts = BufferManager.ask_for_contacts :people, "#{field}: ", default
        if contacts
 -        text = contacts.map { |s| s.longname }.join(", ")
 +        text = contacts.map { |s| s.full_address }.join(", ")
          @header[field] = parse_header field, text
          update
        end