diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl
index c97d4fad6..c67c5ffb2 100644
--- a/admin-dev/themes/default/template/controllers/emails/content.tpl
+++ b/admin-dev/themes/default/template/controllers/emails/content.tpl
@@ -32,7 +32,9 @@
 	var errorMail = "{l s='This email address is not valid' js=1}";
 	$(document).ready(function() {
 		if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
-			$('#smtp').show();
+			$('#configuration_fieldset_smtp').show();
+		else
+			$('#configuration_fieldset_smtp').hide();
 	});
 </script>
 <script type="text/javascript" src="../js/sendMailTest.js"></script>
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index a6d1d1b64..85c6c6b7d 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -62,9 +62,9 @@ class AdminEmailsControllerCore extends AdminController
 							2 => $this->l('Set my own SMTP parameters. For advanced users ONLY')
 						),
 						'js' => array(
-							1 => 'onclick="$(\'#smtp\').slideUp();"', 
-							2 => 'onclick="$(\'#smtp\').slideDown();"',
-							3 => 'onclick="$(\'#smtp\').slideUp();"'
+							1 => 'onclick="$(\'#configuration_fieldset_smtp\').slideUp();"', 
+							2 => 'onclick="$(\'#configuration_fieldset_smtp\').slideDown();"',
+							3 => 'onclick="$(\'#configuration_fieldset_smtp\').slideUp();"'
 						),
 						'visibility' => Shop::CONTEXT_ALL
 					),
@@ -79,8 +79,6 @@ class AdminEmailsControllerCore extends AdminController
 			),
 			'smtp' => array(
 				'title' => $this->l('Email'),
-				'top' => '<div id="smtp" style="display: '.((Configuration::get('PS_MAIL_METHOD') == 2) ? 'block' : 'none').';">',
-				'bottom' => '</div>',
 				'fields' =>	array(
 					'PS_MAIL_DOMAIN' => array(
 						'title' => $this->l('Mail domain name:'),