Merge branches 'prev-next-improv', 'fix-warnings', 'mime-view', 'charset', 'join...

diff --cc lib/sup/message.rb
index ef5e3d1e208b90544ea47625598e4da85a137b8b,bd371628fb8045b1fc31cb529d5eb3ed0daf5d62,65aebd5763402cc8462655fd0d5fae6bfbe857cf,651c839e76198a7b978e7aef1a4203e7562ef2fb,bd371628fb8045b1fc31cb529d5eb3ed0daf5d62,65aebd5763402cc8462655fd0d5fae6bfbe857cf..853f2fccb3676d4df05759d4b3e81e19df04efd4
--- 1/lib/sup/message.rb
--- 2/lib/sup/message.rb
--- 3/lib/sup/message.rb
--- 4/lib/sup/message.rb
--- 5/lib/sup/message.rb
--- 6/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@@@@@@ -29,7 -29,7 -29,7 -29,7 -29,7 -29,7 +29,7 @@@@@@@ class Messag
      
        QUOTE_PATTERN = /^\s{0,4}[>|\}]/
        BLOCK_QUOTE_PATTERN = /^-----\s*Original Message\s*----+$/
 -- --  QUOTE_START_PATTERN = /(^\s*Excerpts from)|(^\s*In message )|(^\s*In article )|(^\s*Quoting )|((wrote|writes|said|says)\s*:\s*$)/
   -    QUOTE_START_PATTERN = /\w/
 +++++  QUOTE_START_PATTERN = /\w.*:$/
        SIG_PATTERN = /(^-- ?$)|(^\s*----------+\s*$)|(^\s*_________+\s*$)|(^\s*--~--~-)|(^\s*--\+\+\*\*==)/
      
        MAX_SIG_DISTANCE = 15 # lines from the end
@@@@@@@ -420,7 -420,7 -417,7 -435,7 -420,7 -417,7 +435,7 @@@@@@@ privat
            when :text
              newstate = nil
      
 -- --        if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && (nextline =~ QUOTE_PATTERN || nextline =~ QUOTE_START_PATTERN))
   -          if line =~ QUOTE_START_PATTERN && nextline =~ QUOTE_PATTERN
 +++++        if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && nextline =~ QUOTE_PATTERN)
                newstate = :quote
              elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
                newstate = :sig