diff --git a/ChangeLog b/ChangeLog
index bb687ed88..ee3e3a6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-28  Cyril Robert <crobert@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAptMailInvitation.m: Added Spanish definition.
+	* SoObjects/Appointments/SOGoAptMailICalReply.m: Added Spanish definition.
+	* SoObjects/Appointments/SOGoAptMailDeletion.m: Added Spanish definition.
+	* SoObjects/Appointments/SOGoAptMailUpdate.m: Added Spanish definition.
+
+2009-09-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUser.m (+initialize): avoid a crash when
+	SOGoProfileURL is not set.
+
 2009-09-27  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Reworked the UIxMailPartSignedViewer to inherit
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 6dcaa6007..adb3e1d73 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -3195,6 +3195,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   [event setUid: uid];
   object = [SOGoAppointmentObject objectWithName: uid
                                     inContainer: self];
+  [object setIsNew: YES];
   content = 
     [NSString stringWithFormat: @"BEGIN:VCALENDAR\n%@\nEND:VCALENDAR", 
      [event versitString]];
diff --git a/SoObjects/Appointments/SOGoAptMailDeletion.m b/SoObjects/Appointments/SOGoAptMailDeletion.m
index 970772ddc..ed0e5d277 100644
--- a/SoObjects/Appointments/SOGoAptMailDeletion.m
+++ b/SoObjects/Appointments/SOGoAptMailDeletion.m
@@ -69,3 +69,9 @@
 @implementation SOGoAptMailRussianDeletion
 @end
 
+@interface SOGoAptMailSpanishDeletion : SOGoAptMailNotification
+@end
+
+@implementation SOGoAptMailSpanishDeletion
+@end
+
diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m
index d0f9e82cb..022114482 100644
--- a/SoObjects/Appointments/SOGoAptMailICalReply.m
+++ b/SoObjects/Appointments/SOGoAptMailICalReply.m
@@ -245,3 +245,9 @@ static NSCharacterSet *wsSet  = nil;
 @implementation SOGoAptMailRussianICalReply
 @end
 
+@interface SOGoAptMailSpanishICalReply : SOGoAptMailICalReply
+@end
+
+@implementation SOGoAptMailSpanishICalReply
+@end
+
diff --git a/SoObjects/Appointments/SOGoAptMailInvitation.m b/SoObjects/Appointments/SOGoAptMailInvitation.m
index b56cf582b..32c1363c1 100644
--- a/SoObjects/Appointments/SOGoAptMailInvitation.m
+++ b/SoObjects/Appointments/SOGoAptMailInvitation.m
@@ -69,3 +69,9 @@
 @implementation SOGoAptMailRussianInvitation
 @end
 
+@interface SOGoAptMailSpanishInvitation : SOGoAptMailNotification
+@end
+
+@implementation SOGoAptMailSpanishInvitation
+@end
+
diff --git a/SoObjects/Appointments/SOGoAptMailUpdate.m b/SoObjects/Appointments/SOGoAptMailUpdate.m
index e16d68541..6595d1af0 100644
--- a/SoObjects/Appointments/SOGoAptMailUpdate.m
+++ b/SoObjects/Appointments/SOGoAptMailUpdate.m
@@ -88,3 +88,11 @@
 @implementation SOGoAptMailItalianUpdate
 @end
 
+@interface SOGoAptMailSpanishUpdate : SOGoAptMailNotification
+{
+}
+@end
+
+@implementation SOGoAptMailSpanishUpdate
+@end
+
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index fc49e66b2..6ceb75d83 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -146,7 +146,8 @@ _timeValue (NSString *key)
 		    @" was renamed to 'SOGoProfileURL'"];
 	    }
 	}
-      SOGoProfileURL = [[NSURL alloc] initWithString: profileURL];
+      if (profileURL)
+        SOGoProfileURL = [[NSURL alloc] initWithString: profileURL];
     }
   if (!fallbackIMAP4Server)
     ASSIGN (fallbackIMAP4Server,
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 27de79d4b..94a47e541 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -207,24 +207,24 @@
 
 - (BOOL) importVcard: (NGVCard *) card
 {
-  NSString *uid, *name;
+  NSString *uid;
   SOGoContactGCSFolder *folder;
-  NSException *ex;
+  SOGoContactGCSEntry *contact;
   BOOL rc = NO;
 
   if (card)
     {
       folder = [self clientObject];
       uid = [folder globallyUniqueObjectId];
-      name = [NSString stringWithFormat: @"%@.vcf", uid];
+
       [card setUid: uid];
-      ex = [[folder ocsFolder] writeContent: [card versitString]
-                                     toName: name
-                                baseVersion: 0];
-      if (ex)
-        NSLog (@"write failed: %@", ex);
-      else
-        rc = YES;
+      contact = [SOGoContactGCSEntry objectWithName: uid
+                                        inContainer: folder];
+      [contact setIsNew: YES];
+      
+      [contact saveContentString: [card versitString]];
+      
+      rc = YES;
     }
 
   return rc;
diff --git a/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox
index d8ab883da..f3280139b 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox
@@ -1,17 +1,16 @@
 <?xml version="1.0" standalone="yes"?>
+<!DOCTYPE div>
 <div xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:var="http://www.skyrix.com/od/binding"
-     xmlns:const="http://www.skyrix.com/od/constant"
-     xmlns:rsrc="OGo:url"
-     xmlns:label="OGo:label"
->
-  <div>
-    <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
-      <div>
-        <var:component value="contentViewerComponent" 
-                       bodyInfo="childInfo"
-		       partPath="childPartPath" />
-      </div>
-    </var:foreach>
-  </div>
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  >
+  <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
+    <div>
+      <var:component value="contentViewerComponent" 
+	bodyInfo="childInfo"
+	partPath="childPartPath" />
+    </div>
+  </var:foreach>
 </div>
diff --git a/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox
index 89b277006..7733e0d60 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox
@@ -5,18 +5,15 @@
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
-  class="mailer_plaincontent signed"
+  class="signed"
   const:id="signedMessage"
   var:valid="validSignature"
-  var:error="validationMessage"
->
-  <div>
-    <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
-      <div>
-        <var:component value="contentViewerComponent" 
-                       bodyInfo="childInfo"
-		       partPath="childPartPath" />
-      </div>
-    </var:foreach>
-  </div>
+  var:error="validationMessage">
+  <var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
+    <div>
+      <var:component value="contentViewerComponent" 
+	bodyInfo="childInfo"
+	partPath="childPartPath" />
+    </div>
+  </var:foreach>
 </div>