I have rolled back Stefan's additions.

This is the equivalent to rev 1.143.
Yes, this is stepping on Stefan's toes a little, but we didn't want a CVS snapshot made with new featuration added. Sorry Stefan, please feel free to commit new feature code once we branch 1.5.0.

functions/page_header.php

@@ -238,11 +238,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
         displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
     } 
     echo "  \n";
-    if (getPref($data_dir, $username,"vcard")==1)  {
-      displayInternalLink ('src/addressbook_vcard.php', _("Addresses"), 'right');
-    } else {
     displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
-    }
     echo "  \n";
     displayInternalLink ('src/folders.php', _("Folders"), 'right');
     echo "  \n";