From 49e964c5294f9b65295e55a46417a2fa73eadf44 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 3 Jun 2013 11:47:48 -0400
Subject: [PATCH] Fix decoding charset parameter

To avoid a libxml bug/limitation, we were already stripping the charset
parameter, but we were not considering the single quote as valid
delimiter.
---
 NEWS                                       | 7 +++++++
 UI/MailPartViewers/UIxMailPartHTMLViewer.m | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index a937922eb..0ce339e67 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
+2.0.6 (2013-MM-DD)
+------------------
+
+Bug fixes
+ - Fixed decoding of the charset parameter when using single quotes (#2306)
+
 2.0.5a (2013-04-17)
+------------------
 
 Bug fixes
  - Fixed an issue when parsing user CN with leading or trailing spaces (#2287)
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 29d425a03..21785e226 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -189,7 +189,7 @@ static NSData* _sanitizeContent(NSData *theData)
 	      j = 8;
               found_delimiter = YES;
 
-	      while (*(bytes+j) != ' ' && *(bytes+j) != '"')
+	      while (*(bytes+j) != ' ' && *(bytes+j) != '"' && *(bytes+j) != '\'')
 		{
 		  j++;