diff --git a/ChangeLog b/ChangeLog
index 7094a3922..9612e1bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-07  Ludovic Marcotte <ludovic@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailRenderingContext.m 
+	We treat multipart/appledouble like multipart/mixed
+	for now. That allows the user to save both parts.
+
+	* Corrected typos in Localizable.string files.
+
 2007-12-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxAclEditor.m ([-currentUserIsOwner]): replaced
diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 9d17ab3ea..6762a87f0 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -29,7 +29,7 @@
 "Unit" = "Unit";
 "delete" = "delete";
 "edit" = "edit";
-"invalidemailwarn" = "invalidemailwarn";
+"invalidemailwarn" = "The specified email is invalid";
 "new" = "new";
 "Preferred Phone"   = "Preferred Phone";
 
diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index 4854e4855..973321b48 100644
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* this file is in UTF-8 format! */
+e/* this file is in UTF-8 format! */
 
 "Contact" = "Contact";
 "Address" = "Adresses";
@@ -36,7 +36,7 @@
 "Unit"              = "Département";
 "delete"            = "Effacer";
 "edit"              = "Éditer";
-"invalidemailwarn"  = "Champ de l'email invalide, continuer quand même ?";
+"invalidemailwarn"  = "Le champ de l'adresse électronique est invalide";
 "new"               = "Nouveau";
 "Preferred Phone"   = "Numéro préféré";
 
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index a82097f65..0ed6f0bb3 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -258,7 +258,7 @@ static BOOL showNamedTextAttachmentsInline = NO;
 
   if ([mt isEqualToString:@"multipart"])
     {
-      if ([st isEqualToString:@"mixed"] || [st isEqualToString:@"related"])
+      if ([st isEqualToString:@"mixed"] || [st isEqualToString:@"related"] || [st isEqualToString: @"appledouble"])
 	return [self mixedViewer];
       else if ([st isEqualToString:@"signed"])
 	return [self signedViewer];