diff -Naur ../cvs/roundcubemail/program/localization/en_US/labels.inc ../htdocs-cvs/program/localization/en_US/labels.inc
--- ../cvs/roundcubemail/program/localization/en_US/labels.inc	2006-02-04 19:05:36.000000000 +0100
+++ ../htdocs-cvs/program/localization/en_US/labels.inc	2006-02-06 15:04:34.000000000 +0100
@@ -137,6 +137,10 @@
 $labels['firstname'] = 'First name';
 $labels['surname']   = 'Last name';
 $labels['email']     = 'E-Mail';
+$labels['homephone'] = 'Home';
+$labels['prophone']  = 'Work';
+$labels['mobile']    = 'Mobile';
+$labels['fax']       = 'Fax';
 
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
diff -Naur ../cvs/roundcubemail/program/localization/fr/labels.inc ../htdocs-cvs/program/localization/fr/labels.inc
--- ../cvs/roundcubemail/program/localization/fr/labels.inc	2006-02-04 19:05:36.000000000 +0100
+++ ../htdocs-cvs/program/localization/fr/labels.inc	2006-02-06 14:59:32.000000000 +0100
@@ -130,6 +130,10 @@
 $labels['firstname'] = 'Pr��nom';
 $labels['surname']   = 'Nom';
 $labels['email']     = 'e-Mail';
+$labels['homephone'] = 'T��l��phone personnel';
+$labels['prophone']  = 'T��l��phone professionel';
+$labels['mobile']    = 'T��l��phone portable';
+$labels['fax']       = 'Fax';
 
 $labels['addcontact'] = 'Ajouter un nouveau contact';
 $labels['editcontact'] = 'Editer le contact';
@@ -187,4 +191,4 @@
 $labels['sortdesc'] = 'Tri descendant';
 
 
-?>
\ Pas de fin de ligne �� la fin du fichier.
+?>
diff -Naur ../cvs/roundcubemail/program/steps/addressbook/edit.inc ../htdocs-cvs/program/steps/addressbook/edit.inc
--- ../cvs/roundcubemail/program/steps/addressbook/edit.inc	2005-12-03 17:54:12.000000000 +0100
+++ ../htdocs-cvs/program/steps/addressbook/edit.inc	2006-02-06 15:01:51.000000000 +0100
@@ -65,7 +65,7 @@
   // return the complete address edit form as table
   $out = "$form_start<table>\n\n";
 
-  $a_show_cols = array('name', 'firstname', 'surname', 'email');
+  $a_show_cols = array('name', 'firstname', 'surname', 'email', 'homephone', 'prophone', 'mobile', 'fax');
   foreach ($a_show_cols as $col)
     {
     $attrib['id'] = 'rcmfd_'.$col;
@@ -123,4 +123,4 @@
 
 // this will be executed if no template for addcontact exists
 parse_template('editcontact');
-?>
\ Pas de fin de ligne �� la fin du fichier.
+?>
diff -Naur ../cvs/roundcubemail/program/steps/addressbook/show.inc ../htdocs-cvs/program/steps/addressbook/show.inc
--- ../cvs/roundcubemail/program/steps/addressbook/show.inc	2005-12-03 17:54:12.000000000 +0100
+++ ../htdocs-cvs/program/steps/addressbook/show.inc	2006-02-06 15:00:55.000000000 +0100
@@ -53,10 +53,12 @@
   // return the complete address record as table
   $out = "<table>\n\n";
 
-  $a_show_cols = array('name', 'firstname', 'surname', 'email');
+  $a_show_cols = array('name', 'firstname', 'surname', 'email', 'homephone', 'prophone', 'mobile', 'fax');
   foreach ($a_show_cols as $col)
     {
-    if ($col=='email' && $CONTACT_RECORD[$col])
+    if ($CONTACT_RECORD[$col] == "")
+      continue;
+    else if ($col=='email' && $CONTACT_RECORD[$col])
       $value = sprintf('<a href="#compose" onclick="%s.command(\'compose\', %d)" title="%s">%s</a>',
                        $JS_OBJECT_NAME,
                        $CONTACT_RECORD['contact_id'],
@@ -77,4 +79,4 @@
 
 
 parse_template('showcontact');
-?>
\ Pas de fin de ligne �� la fin du fichier.
+?>
diff -Naur ../cvs/roundcubemail/SQL/mysql.notebook.update.sql ../htdocs-cvs/SQL/mysql.notebook.update.sql
--- ../cvs/roundcubemail/SQL/mysql.notebook.update.sql	1970-01-01 01:00:00.000000000 +0100
+++ ../htdocs-cvs/SQL/mysql.notebook.update.sql	2006-02-06 15:08:38.000000000 +0100
@@ -0,0 +1,4 @@
+ALTER TABLE contacts ADD `homephone` VARCHAR(20);
+ALTER TABLE contacts ADD `prophone` VARCHAR(20);
+ALTER TABLE contacts ADD `mobile` VARCHAR(20);
+ALTER TABLE contacts ADD `fax` VARCHAR(20);