diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index 7d63ff7b..45a9b92b 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -63,7 +63,7 @@ return array(
 					'ssl' => array(
 						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
 						'label' => 'SSL Redirect',
-						'type' => 'text',
+						'type' => 'yesno',
 						'yesno_var' => $ssl_redirect
 					),
 					'openbasedir' => array(
diff --git a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
new file mode 100644
index 00000000..da72cf02
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_accountchangepasswd' => array(
+		'title' => $lng['menue']['main']['changepassword'],
+		'image' => 'icons/email_edit.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['menue']['main']['changepassword'],
+				'image' => 'icons/email_edit.png',
+				'fields' => array(
+					'email_full' => array(
+						'label' => $lng['emails']['emailaddress'],
+						'type' => 'label',
+						'value' => $result['email_full']
+					),
+					'email_password' => array(
+						'label' => $lng['login']['password'],
+						'type' => 'password'
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/email/formfield.emails_accountchangequota.php b/lib/formfields/customer/email/formfield.emails_accountchangequota.php
new file mode 100644
index 00000000..28e9da70
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_accountchangequota.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_accountchangequota' => array(
+		'title' => $lng['emails']['quota_edit'],
+		'image' => 'icons/email_edit.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['emails']['quota_edit'],
+				'image' => 'icons/email_edit.png',
+				'fields' => array(
+					'email_full' => array(
+						'label' => $lng['emails']['emailaddress'],
+						'type' => 'label',
+						'value' => $result['email_full']
+					),
+					'email_quota' => array(
+						'label' => $lng['emails']['quota'].' ('.$lng['panel']['megabyte'].')',
+						'type' => 'text',
+						'value' => $result['quota']
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/email/formfield.emails_add.php b/lib/formfields/customer/email/formfield.emails_add.php
new file mode 100644
index 00000000..5ea85d68
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_add.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_add' => array(
+		'title' => $lng['emails']['emails_add'],
+		'image' => 'icons/email_add.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['emails']['emails_add'],
+				'image' => 'icons/email_add.png',
+				'fields' => array(
+					'email_part' => array(
+						'label' => $lng['emails']['emailaddress'],
+						'type' => 'text'
+					),
+					'domain' => array(
+						'label' => '@TODO up to email-part',
+						'type' => 'select',
+						'select_var' => $domains
+					),
+					'pathedit' => array(
+						'label' => $lng['emails']['iscatchall'],
+						'type' => 'yesno',
+						'yesno_var' => $iscatchall
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php
new file mode 100644
index 00000000..895b682e
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_addaccount.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_addaccount' => array(
+		'title' => $lng['emails']['account_add'],
+		'image' => 'icons/email_add.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['emails']['account_add'],
+				'image' => 'icons/email_add.png',
+				'fields' => array(
+					'email_full' => array(
+						'label' => $lng['emails']['emailaddress'],
+						'type' => 'label',
+						'value' => $result['email_full']
+					),
+					'email_password' => array(
+						'label' => $lng['login']['password'],
+						'type' => 'password'
+					),
+					'email_quota' => array(
+						'visible' => $settings['system']['mail_quota_enabled'],
+						'label' => $lng['emails']['quota'],
+						'desc' => $lng['panel']['megabyte'],
+						'type' => 'text',
+						'value' => $quota
+					),
+					'alternative_email' => array(
+						'visible' => $settings['panel']['sendalternativemail'],
+						'label' => $lng['emails']['alternative_emailaddress'],
+						'type' => 'text'
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php
new file mode 100644
index 00000000..9532bd68
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_addforwarder' => array(
+		'title' => $lng['emails']['forwarder_add'],
+		'image' => 'icons/add_autoresponder.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['emails']['forwarder_add'],
+				'image' => 'icons/add_autoresponder.png',
+				'fields' => array(
+					'email_full' => array(
+						'label' => $lng['emails']['from'],
+						'type' => 'label',
+						'value' => $result['email_full']
+					),
+					'destination' => array(
+						'label' => $lng['emails']['to'],
+						'type' => 'text'
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php
new file mode 100644
index 00000000..9a45d847
--- /dev/null
+++ b/lib/formfields/customer/email/formfield.emails_edit.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'emails_edit' => array(
+		'title' => $lng['emails']['emails_edit'],
+		'image' => 'icons/email_edit.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['emails']['emails_edit'],
+				'image' => 'icons/email_edit.png',
+				'fields' => array(
+					'email_full' => array(
+						'label' => $lng['emails']['emailaddress'],
+						'type' => 'label',
+						'value' => $result['email_full']
+					),
+					'account_yes' => array(
+						'visible' => ($result['popaccountid'] != 0 ? true : false),
+						'label' => $lng['emails']['account'],
+						'type' => 'label',
+						'value' => $lng['panel']['yes'].'&nbsp;[<a href="'.$filename.'?page=accounts&amp;action=changepw&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['menue']['main']['changepassword'].'</a>] [<a href="'.$filename.'?page=accounts&amp;action=delete&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['account_delete'].'</a>]'
+					),
+					'account_no' => array(
+						'visible' => ($result['popaccountid'] == 0 ? true : false),
+						'label' => $lng['emails']['account'],
+						'type' => 'label',
+						'value' => $lng['panel']['no'].'&nbsp;[<a href="'.$filename.'?page=accounts&amp;action=add&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['account_add'].'</a>]'
+					),
+					'mail_quota' => array(
+						'visible' => ($result['popaccountid'] != 0 && $settings['system']['mail_quota_enabled']),
+						'label' => $lng['customer']['email_quota'],
+						'type' => 'label',
+						'value' => $result['quota'].' '.$lng['panel']['megabyte'].' [<a href="'.$filename.'?page=accounts&amp;action=changequota&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['quota_edit'].'</a>]'
+					),
+					'mail_catchall' => array(
+						'label' => $lng['emails']['catchall'],
+						'type' => 'label',
+						'value' => ($result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']).' [<a href="'.$filename.'?page='.$page.'&amp;action=togglecatchall&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['panel']['toggle'].'</a>]'
+					),
+					'mail_fwds' => array(
+						'label' => $lng['emails']['forwarders'].' ('.$forwarders_count.')',
+						'type' => 'label',
+						'value' => $forwarders.' <a href="'.$filename.'?page=forwarders&amp;action=add&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['forwarder_add'].'</a>'
+					)
+				)
+			)
+		)
+	)
+);