diff --git a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoCatalanForward.html b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html
similarity index 100%
rename from SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoCatalanForward.html
rename to SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html
diff --git a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod
new file mode 100644
index 000000000..7787fa18e
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod
@@ -0,0 +1,79 @@
+subject: WOString {
+  value = subject;
+  escapeHTML = NO;
+}
+
+date: WOString {
+  value = date;
+  escapeHTML = NO;
+}
+
+from: WOString {
+  value = from;
+  escapeHTML = NO;
+}
+
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
+hasReplyTo: WOConditional {
+  condition = hasReplyTo;
+}
+
+replyTo: WOString {
+  value = replyTo;
+  escapeHTML = NO;
+}
+
+hasOrganization: WOConditional {
+  condition = hasOrganization;
+}
+
+organization: WOString {
+  value = organization;
+  escapeHTML = NO;
+}
+
+to: WOString {
+  value = to;
+  escapeHTML = NO;
+}
+
+hasCc: WOConditional {
+  condition = hasCc;
+}
+
+cc: WOString {
+  value = cc;
+  escapeHTML = NO;
+}
+
+hasNewsGroups: WOConditional {
+  condition = hasNewsGroups;
+}
+
+newsgroups: WOString {
+  value = newsgroups;
+  escapeHTML = NO;
+}
+
+hasReferences: WOConditional {
+  condition = hasReferences;
+}
+
+references: WOString {
+  value = references;
+  escapeHTML = NO;
+}
+
+messageBody: WOString {
+  value = messageBody;
+  escapeHTML = NO;
+}
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}
diff --git a/SoObjects/Mailer/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.wod b/SoObjects/Mailer/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.wod
new file mode 100644
index 000000000..3fbed6d61
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.wod
@@ -0,0 +1,106 @@
+outlookMode: WOConditional {
+  condition = outlookMode;
+}
+
+standardMode: WOConditional {
+  condition = outlookMode;
+  negate = YES;
+}
+
+subject: WOString {
+  value = subject;
+  escapeHTML = NO;
+}
+
+date: WOString {
+  value = date;
+  escapeHTML = NO;
+}
+
+from: WOString {
+  value = from;
+  escapeHTML = NO;
+}
+
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
+hasReplyTo: WOConditional {
+  condition = hasReplyTo;
+}
+
+replyTo: WOString {
+  value = replyTo;
+  escapeHTML = NO;
+}
+
+hasOrganization: WOConditional {
+  condition = hasOrganization;
+}
+
+organization: WOString {
+  value = organization;
+  escapeHTML = NO;
+}
+
+to: WOString {
+  value = to;
+  escapeHTML = NO;
+}
+
+hasCc: WOConditional {
+  condition = hasCc;
+}
+
+cc: WOString {
+  value = cc;
+  escapeHTML = NO;
+}
+
+hasNewsGroups: WOConditional {
+  condition = hasNewsGroups;
+}
+
+newsgroups: WOString {
+  value = newsgroups;
+  escapeHTML = NO;
+}
+
+hasReferences: WOConditional {
+  condition = hasReferences;
+}
+
+references: WOString {
+  value = references;
+  escapeHTML = NO;
+}
+
+messageBody: WOString {
+  value = messageBody;
+  escapeHTML = NO;
+}
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}
+
+replyPlacementOnTop: WOConditional {
+  condition = replyPlacementOnTop;
+}
+
+replyPlacementOnBottom: WOConditional {
+  condition = replyPlacementOnTop;
+  negate = YES;
+}
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}
diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h
index 5e8461efa..fff83798e 100644
--- a/SoObjects/Mailer/SOGoMailForward.h
+++ b/SoObjects/Mailer/SOGoMailForward.h
@@ -42,6 +42,9 @@
 @interface SOGoMailBrazilianPortugueseForward : SOGoMailForward
 @end
 
+@interface SOGoMailCatalanForward : SOGoMailForward
+@end
+
 @interface SOGoMailCzechForward : SOGoMailForward
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 1452845a8..7d8b8bcef 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -236,6 +236,9 @@
 @implementation SOGoMailBrazilianPortugueseForward
 @end
 
+@implementation SOGoMailCatalanForward
+@end
+
 @implementation SOGoMailCzechForward
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h
index 51166ddd7..db67b84ea 100644
--- a/SoObjects/Mailer/SOGoMailReply.h
+++ b/SoObjects/Mailer/SOGoMailReply.h
@@ -1,6 +1,6 @@
 /* SOGoMailReply.h - this file is part of SOGo
  *
- * Copyright (C) 2007-2009 Inverse inc.
+ * Copyright (C) 2007-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -47,6 +47,9 @@
 @interface SOGoMailBrazilianPortugueseReply : SOGoMailReply
 @end
 
+@interface SOGoMailCatalanReply : SOGoMailReply
+@end
+
 @interface SOGoMailCzechReply : SOGoMailReply
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m
index c1a9b116b..64558e93d 100644
--- a/SoObjects/Mailer/SOGoMailReply.m
+++ b/SoObjects/Mailer/SOGoMailReply.m
@@ -104,6 +104,9 @@
 @implementation SOGoMailBrazilianPortugueseReply
 @end
 
+@implementation SOGoMailCatalanReply
+@end
+
 @implementation SOGoMailCzechReply
 @end