Index: wp-includes/registration.php
===================================================================
--- wp-includes/registration.php	(Revision 13628)
+++ wp-includes/registration.php	(Arbeitskopie)
@@ -323,6 +323,8 @@
  */
 function _wp_get_user_contactmethods() {
 	$user_contactmethods = array(
+		'user_email' => __('E-Mail'),
+		'user_url' => __('Website'),
 		'aim' => __('AIM'),
 		'yim' => __('Yahoo IM'),
 		'jabber' => __('Jabber / Google Talk')
@@ -281,23 +289,30 @@
 </tr>
 </table>
 
-<h3><?php _e('Contact Info') ?></h3>
 
-<table class="form-table">
-<tr>
-	<th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /></td>
-</tr>
+<?php
+$user_contactmethods = _wp_get_user_contactmethods();
 
-<tr>
-	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="text" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
-</tr>
+// For backwards compatibility
+function user_user_email_label($desc){
+	return  $desc.' <span class="description">'. __('(required)').'</span>';
+}
+add_filter('user_user_email_label','user_user_email_label');
 
-<?php
-	foreach (_wp_get_user_contactmethods() as $name => $desc) {
+if (!empty($user_contactmethods)) {
 ?>
-<tr>
+
+<div id="profile-contact-info">
+
+<h3 id="profile-contact-info-title"><?php _e('Contact Info') ?></h3>
+
+<table class="form-table">
+
+<?php 
+	foreach ($user_contactmethods as $name => $desc) {
+?>
+<tr id="profile-contact-info-<?php echo $name; ?>">
 	<th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
 </tr>
@@ -306,10 +321,17 @@
 ?>
 </table>
 
-<h3><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h3>
+</div>
+<?php
+}
+?>
 
+<div id="profile-about-yourself">
+
+<h3 id="profile-about-yourself-title"><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h3>
+
 <table class="form-table">
-<tr>
+<tr id="profile-about-yourself-description">
 	<th><label for="description"><?php _e('Biographical Info'); ?></label></th>
 	<td><textarea name="description" id="description" rows="5" cols="30"><?php echo esc_html($profileuser->description); ?></textarea><br />
 	<span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span></td>