diff --git a/ChangeLog b/ChangeLog
index 0446adade..89284073e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-05  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -responseWithStatus:):
+	we now set the content-type to "text/plain" to fix issues with nginx.
+
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	([UIxMailPartHTMLViewer
+	-startElement:namespace:rawName:attributes:]): the base tag must be ignored.
+
 2009-01-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * Updated the Apache section in the installation
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index db38b231d..4942a9dca 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -276,6 +276,8 @@ _xmlCharsetForCharset (NSString *charset)
   showWhoWeAre();
   if (inStyle || inScript)
     ;
+  else if ([_localName caseInsensitiveCompare: @"base"] == NSOrderedSame)
+    ;
   else if ([_localName caseInsensitiveCompare: @"body"] == NSOrderedSame)
     inBody = YES;
   else if ([_localName caseInsensitiveCompare: @"script"] == NSOrderedSame)
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 29643f56c..936d4e21d 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -603,6 +603,7 @@ static BOOL uixDebugEnabled = NO;
 
   response = [context response];
   [response setStatus: status];
+  [response setHeader: @"text/plain" forKey: @"Content-Type"];
 
   return response;
 }