diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 50d8bd65b9..5c4fe9a2c8 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -615,20 +615,12 @@
 		echo "	".$text['label-email']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "<table border='0' cellpadding='2' cellspacing='0'>\n";
 		$x = 0;
 		foreach ($fax_emails as $email) {
-			echo "<tr>\n";
-			echo "<td>\n";
-			echo "	<input class='formfld' type=\"email\" name=\"fax_email[".$x."]\" maxlength='255' style=\"width: 90%;\"value=\"".escape($email)."\">\n";
-			echo "</td>\n";
+			echo "	<input class='formfld' type='email' name='fax_email[".$x."]' maxlength='255' value=\"".escape($email)."\"><br>\n";
 			$x++;
 		}
-		echo "<tr>\n";
-		echo "	<td>\n";
-		echo "		<input class='formfld' type=\"email\" name=\"fax_email[".$x++."]\" maxlength='255' style=\"width: 90%;\"value=\"\">\n";
-		echo "	</td>\n";
-		echo "</table>\n";
+		echo "	<input class='formfld' type='email' name='fax_email[".$x++."]' maxlength='255' value=''>\n";
 		echo "<br />\n";
 		echo "	".$text['description-email']."\n";
 		echo "</td>\n";
@@ -655,20 +647,12 @@
 		echo "	".$text['label-email_confirmation']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "<table border='0' cellpadding='2' cellspacing='0'>\n";
 		$x = 0;
-		foreach($fax_email_confirmations as $email) {
-			echo "<tr>\n";
-			echo "<td>\n";
-			echo "	<input class='formfld' type=\"email\" name=\"fax_email_confirmation[".$x."]\" maxlength='255' style=\"width: 90%;\"value=\"".escape($email)."\">\n";
-			echo "</td>\n";
+		foreach ($fax_email_confirmations as $email) {
+			echo "	<input class='formfld' type='email' name='fax_email_confirmation[".$x."]' maxlength='255' value=\"".escape($email)."\"><br>\n";
 			$x++;
 		}
-		echo "<tr>\n";
-		echo "	<td>\n";
-		echo "		<input class='formfld' type=\"email\" name=\"fax_email_confirmation[".$x++."]\" maxlength='255' style=\"width: 90%;\"value=\"\">\n";
-		echo "	</td>\n";
-		echo "</table>\n";
+		echo "	<input class='formfld' type='email' name='fax_email_confirmation[".$x++."]' maxlength='255' value=''>\n";
 		echo "<br />\n";
 		echo "	".$text['description-email_confirmation']."\n";
 		echo "</td>\n";
@@ -734,7 +718,7 @@
 			echo "		<td class='vtable'>";
 
 			if (!empty($fax_users) && is_array($fax_users) && @sizeof($fax_users) != 0) {
-				echo "		<table style='width: 50%; min-width: 200px; max-width: 450px;'>\n";
+				echo "		<table style='width: 50%; min-width: 150px; max-width: 450px;'>\n";
 				foreach ($fax_users as $field) {
 					echo "		<tr>\n";
 					echo "			<td class='vtable'>".escape($field['username'])."</td>\n";
@@ -808,4 +792,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/themes/default/css.php b/themes/default/css.php
index 30b9e04ff0..45796acd8b 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -1747,6 +1747,7 @@ else { //default: white
 	input[type=number].formfld,
 	input[type=url].formfld,
 	input[type=password].formfld,
+	input[type=email].formfld,
 	label.formfld {
 		font-family: <?=$input_text_font?>;
 		font-size: <?=$input_text_size?>;
@@ -1784,11 +1785,13 @@ else { //default: white
 	input[type=text].txt,
 	input[type=number].txt,
 	input[type=password].txt,
+	input[type=email].txt,
 	textarea.formfld,
 	input[type=text].formfld,
 	input[type=number].formfld,
 	input[type=url].formfld,
-	input[type=password].formfld {
+	input[type=password].formfld,
+	input[type=email].formfld {
 		transition: width 0.25s;
 		-moz-transition: width 0.25s;
 		-webkit-transition: width 0.25s;
@@ -1811,12 +1814,14 @@ else { //default: white
 	input[type=text].txt:hover,
 	input[type=number].txt:hover,
 	input[type=password].txt:hover,
+	input[type=email].txt:hover,
 	label.txt:hover,
 	textarea.formfld:hover,
 	input[type=text].formfld:hover,
 	input[type=number].formfld:hover,
 	input[type=url].formfld:hover,
 	input[type=password].formfld:hover,
+	input[type=email].formfld:hover,
 	label.formfld:hover {
 		border-color: <?=$input_border_color_hover?>;
 		}
@@ -1825,12 +1830,14 @@ else { //default: white
 	input[type=text].txt:focus,
 	input[type=number].txt:focus,
 	input[type=password].txt:focus,
+	input[type=email].txt:focus,
 	label.txt:focus,
 	textarea.formfld:focus,
 	input[type=text].formfld:focus,
 	input[type=number].formfld:focus,
 	input[type=url].formfld:focus,
 	input[type=password].formfld:focus,
+	input[type=email].formfld:focus,
 	label.formfld:focus {
 		border-color: <?=$input_border_color_focus?>;
 		/* first clear */