From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Sun, 16 Nov 2008 17:18:33 +0000 (+0100)
Subject: decoding rules: ignore ascii-7bit and normalize utf-7
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=70a488fdcda9d20c65e7c81edca7c4d34aa88672;p=sup

decoding rules: ignore ascii-7bit and normalize utf-7
---

diff --git a/lib/sup/util.rb b/lib/sup/util.rb
index f3db95d..fc62532 100644
--- a/lib/sup/util.rb
+++ b/lib/sup/util.rb
@@ -620,10 +620,11 @@ end
 
 class Iconv
   def self.easy_decode target, charset, text
-    return text if charset =~ /^(x-unknown|unknown-8bit)$/i
+    return text if charset =~ /^(x-unknown|unknown[-_]?8bit|ascii[-_]?7[-_]?bit)$/i
     charset = case charset
                 when /UTF[-_]?8/i: "utf-8"
                 when /(iso[-_])?latin[-_]?1$/i: "ISO-8859-1"
+                when /unicode[-_]1[-_]1[-_]utf[-_]7/i: "utf-7"
                 else charset
               end