diff --git a/ChangeLog b/ChangeLog
index 1f25020b9..eec8cd68e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-28  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/Contacts/UIxContactView.m (-primaryEmail, -secondaryEmail):
+	remove double-quotes from FN attribute to avoid JavaScript errors.
+
 	* UI/WebServerResources/UIxMailToSelection.js: removed duplicated
 	functionality in addressFieldLostFocus. Removed the ability to set
 	an auto-completion text field to read-only.
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 47e357f1f..b2e073310 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -1,18 +1,18 @@
 /*
   Copyright (C) 2004 SKYRIX Software AG
-
+ 
   This file is part of OpenGroupware.org.
-
+ 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
-
+ 
   OGo is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
-
+ 
   You should have received a copy of the GNU Lesser General Public
   License along with OGo; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
@@ -114,7 +114,7 @@
   if ([email length] > 0)
     mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
                        @" onclick=\"return openMailTo('%@ <%@>');\">"
-                       @"%@</a>", email, [card fn], email, email];
+                       @"%@</a>", email, [[card fn] stringByReplacingString: @"\""  withString: @""], email, email];
   else
     mailTo = nil;
 
@@ -146,7 +146,7 @@
       if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
 	mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
 			   @" onclick=\"return openMailTo('%@ <%@>');\">"
-			   @"%@</a>", email, [card fn], email, email];
+			   @"%@</a>", email, [[card fn] stringByReplacingString: @"\""  withString: @""], email, email];
     }
 
   return [self _cardStringWithLabel: @"Additional Email:"
diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m
index c89d93603..cf6be8d51 100644
--- a/UI/Contacts/UIxListView.m
+++ b/UI/Contacts/UIxListView.m
@@ -1,6 +1,6 @@
 /* UIxListView.m - this file is part of SOGo
  *
- * Copyright (C) 2008 Inverse inc.
+ * Copyright (C) 2008-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -70,7 +70,7 @@
 - (NSString *) itemOnclick
 {
   return [NSString stringWithFormat: @"return openMailTo('%@ <%@>');",
-          [item fn], [item email]];
+		   [[item fn] stringByReplacingString: @"\""  withString: @""], [item email]];
 }
 
 - (NSString *) itemName