diff --git a/ChangeLog b/ChangeLog
index 43598829b..1c145d641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-05  Jean Raby  <jraby@inverse.ca>
+
+	* UI/Contacts/UIxContactView.m (secondaryEmail):
+	function renamed to secondaryEmails. It now returns all addresses
+	instead of the first one found in the vcard.
+
+	* UI/Templates/ContactsUI/UIxContactView.wox:
+	Show all addresses returned from secondaryEmails.
+	This still need some css tweaks.
+	  
+
 2012-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreRecurrenceUtils.m
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 0433e9a9a..a6a7825a8 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -154,12 +154,14 @@
                value: mailTo];
 }
 
-- (NSString *) secondaryEmail
+- (NSArray *) secondaryEmails
 {
   NSString *email, *fn, *mailTo;
   NSMutableArray *emails;
+  NSMutableArrays *secondaryEmails;
 
   emails = [NSMutableArray array];
+  secondayEmails = [NSMutableArray array];
   mailTo = nil;
 
   [emails addObjectsFromArray: [card childrenWithTag: @"email"]];
@@ -185,6 +187,7 @@
 	{
 	  email = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
 
+          // skip primary email
 	  if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
 	    {
               fn = [card fn];
@@ -193,13 +196,19 @@
 	      mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
 				 @" onclick=\"return openMailTo('%@ <%@>');\">"
 				 @"%@</a>", email, fn, email, email];
-	      break;
+              [secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
+                                       value: mailTo]];
 	    }
 	}
     }
+  else
+    {
+      [secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
+                                        value: mailTo]];
+    }
 
-  return [self _cardStringWithLabel: @"Additional Email:"
-               value: mailTo];
+
+  return secondayEmails;
 }
 
 - (NSString *) screenName
diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox
index d7c8d0059..e00482085 100644
--- a/UI/Templates/ContactsUI/UIxContactView.wox
+++ b/UI/Templates/ContactsUI/UIxContactView.wox
@@ -19,8 +19,10 @@
           ><var:string value="displayName" escapeHTML="NO"
           /><var:string value="nickName" escapeHTML="NO"
           /><var:string value="primaryEmail" escapeHTML="NO"
-          /><var:string value="secondaryEmail" escapeHTML="NO"
-          /><var:string value="screenName" escapeHTML="NO"
+          /><var:foreach list="secondaryEmails" item="currentEmail">
+             <var:string value="currentEmail" escapeHTML="NO"/> 
+            </var:foreach>
+            <var:string value="screenName" escapeHTML="NO"
           /><var:string value="preferredAddress" escapeHTML="NO"
           /><var:string value="categories" escapeHTML="NO"
           /></div