1 files changed, 18 insertions, 6 deletions

diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 70fc57c..71c7817 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -84,6 +84,21 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
 
   QString dynamicPart;
 
+  QStringList emails = mAddressee.emails();
+  QStringList::ConstIterator emailIt;
+  QString type = i18n( "Email" );
+  emailIt = emails.begin();
+  if ( emailIt != emails.end() ) {
+      dynamicPart += QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
+          .arg( type )
+          .arg( name )
+          .arg( *emailIt )
+          .arg( *emailIt );
+      ++emailIt;
+  }
+
   KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
   KABC::PhoneNumber::List::ConstIterator phoneIt;
   for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
@@ -94,10 +109,8 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
       .arg( (*phoneIt).number() );
   }
 
-  QStringList emails = mAddressee.emails();
-  QStringList::ConstIterator emailIt;
-  QString type = i18n( "Email" );
-  for ( emailIt = emails.begin(); emailIt != emails.end(); ++emailIt ) {
+ 
+  for ( ; emailIt != emails.end(); ++emailIt ) {
     dynamicPart += QString(
       "<tr><td align=\"right\"><b>%1</b></td>"
       "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" )
@@ -105,7 +118,6 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
       .arg( name )
       .arg( *emailIt )
       .arg( *emailIt );
-    type = i18n( "Other" );
   }
 
   if ( !mAddressee.url().url().isEmpty() ) {
@@ -149,7 +161,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
   if ( !mAddressee.note().isEmpty() ) {
     notes = QString(
       "<tr>"
-      "<td align=\"right\" valign=\"top\"><b>%1:</b></td>"  // note label
+      "<td align=\"right\" valign=\"top\"><b>%1</b></td>"  // note label
       "<td align=\"left\">%2</td>"  // note
       "</tr>" ).arg( i18n( "Notes" ) )
 //US      .arg( mAddressee.note().replace( '\n', "<br>" ) );