diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 7def03141..90e649de8 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -10638,32 +10638,31 @@ class SurveyAdminSettings {
 				$error = true;
 				$msg = $lang['srv_mail_test_smtp_not_possible'];
 			}
-		}		
+		}
+
+		echo '<div id="divSurveySmtp">';
 		
-		/*// če imamo napake jo izpišemo
+		echo '<h2>'.$lang['srv_mail_test_smtp'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
+
+		// če imamo napake jo izpišemo
 		if ($error == true){
 			echo $lang['srv_mail_test_smtp_error'].': '. $msg;
 		}
 		else{
 			echo $lang['srv_mail_test_smtp_sent'].': '.$email;
 		}
-		
+
 		#vsebino shranimo v buffer
 		$content = ob_get_clean();
+
+		echo $content;
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium blue" onClick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
+        echo '</div>';
 		
-		$popUp = new PopUp();
-		#$popUp->setId('divSurveySmtp');
-		$popUp->setHeaderText($lang['srv_mail_test_smtp']);
-		
-		#dodamo vsebino
-		$popUp->setContent($content);
-		
-		# dodamo gumb Prekliči
-		$button = new PopUpCancelButton();
-		$button->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
-		$popUp->addButton($button);
-	
-		echo $popUp;	*/ //@TG8
+		echo '</div>';
 	}
 }
 ?>
\ No newline at end of file
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 1f10ebb9a..0c7d3388a 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4465,7 +4465,7 @@ function testiranje_preview_settings_save () {
 function showTestSurveySMTP()
 {
 	$('#fade').fadeTo('slow', 1);
-	$('#general_popup').html('').fadeIn('slow');
+	$('#general_popup').html('').addClass('PopUpNarrow').fadeIn('slow');
 	$("#general_popup").load('ajax.php?t=showTestSurveySMTP', $('form[name="settingsanketa_'+srv_meta_anketa_id+'"]').serialize(), function() {});
     
     return false;