Index: system/themes/k2/theme.php
===================================================================
--- system/themes/k2/theme.php	(revision 4067)
+++ system/themes/k2/theme.php	(working copy)
@@ -54,6 +54,7 @@
 
 		//Add formcontrol template with input before label
 		$this->add_template( 'k2_text', dirname(__FILE__) . '/formcontrol_text.php' );
+		$this->add_template( 'k2_email', dirname(__FILE__) . '/formcontrol_email.php' );
 
 
 		if( !$this->template_engine->assigned( 'pages' ) ) {
@@ -122,7 +123,7 @@
 		$form->cf_commenter->caption = '<small><strong>' . _t('Name') . '</strong></small><span class="required">' . ( Options::get('comments_require_id') == 1 ? ' *' . _t('Required') : '' ) . '</span>';
 		$form->cf_commenter->template = 'k2_text';
 		$form->cf_email->caption = '<small><strong>' . _t('Mail') . '</strong> ' . _t( '(will not be published)' ) .'</small><span class="required">' . ( Options::get('comments_require_id') == 1 ? ' *' . _t('Required') : '' ) . '</span>';
-		$form->cf_email->template = 'k2_text';
+		$form->cf_email->template = 'k2_email';
 		$form->cf_url->caption = '<small><strong>' . _t('Website') . '</strong></small>';
 		$form->cf_url->template = 'k2_text';
 	        $form->cf_content->caption = '';
Index: system/themes/k2/formcontrol_email.php
===================================================================
--- system/themes/k2/formcontrol_email.php	(revision 0)
+++ system/themes/k2/formcontrol_email.php	(revision 0)
@@ -0,0 +1,5 @@
+<div<?php echo isset( $class ) ? " class=\"$class\"" : ''; ?><?php echo isset( $id ) ? " id=\"$id\"" : ''; ?>>
+	<input<?php if ( isset( $control_title ) ) { ?> title="<?php echo $control_title; ?>"<?php } else { echo ( isset( $title ) ? " title=\"$title\"" : '' ); } if ( isset( $tabindex ) ) { ?> tabindex="<?php echo $tabindex; ?>"<?php } if ( isset( $size ) ) { ?> size="<?php echo $size; ?>"<?php } ?> type="email" id="<?php echo $field; ?>" name="<?php echo $field; ?>" value="<?php echo htmlspecialchars( $value ); ?>">
+	<label<?php if ( isset( $label_title ) ) { ?> title="<?php echo $label_title; ?>"<?php } else { echo ( isset( $title ) ? " title=\"$title\"" : '' ); } ?> for="<?php echo $field; ?>"><?php echo $this->caption; ?></label>
+	<?php $control->errors_out( '<li>%s</li>', '<ul class="error">%s</ul>' ); ?>
+</div>