diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index 078c45ed4..340e5823c 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -479,79 +479,84 @@ class SurveyAnalysisArchive {
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
-		echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
+		echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
 		
 		# preverimo obstoj datoteke, in dostop
 		$CAE = self::CheckArchiveExistance($aid);
 		 
 		if ( $CAE > 0) {
 			# vsebina emaila in naslovi
+
+			echo '<div class="setting_holder">';
+			echo '<label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].'</label>';
+			echo '<textarea class="textarea email" name="email_archive_list" id="email_archive_list" ></textarea>';
+			echo '</div>';
+
+			echo '<div class="setting_holder">';
+			echo '<label for="subject">' . $lang['srv_inv_archive_subject_text'] . ': </label>';
+			echo '<input type="text" class="text large wauto" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'"/>';
+			echo '</div>';
+            
+			echo '<labelfor="email_archive_text">' . $lang['message'] . ':</label>';
+
 			echo '<div id="div_archives_email_wrap">';
 			echo '<div id="div_archives_email_left">';
-	
-            echo '<p>'.$lang['srv_analiza_archive_message_note'].'</p>';
-            
-			echo '<div ><label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].':</label>'."\n";
-			echo '<textarea name="email_archive_list" rows="4" id="email_archive_list" ></textarea>'."\n";
-            echo '</div>';
-            
-            echo '<br>';
-            
-			echo '<div class="anl_dash_bt">';
-			echo '<br/><label for="subject">' . $lang['subject'] . ': </label>';
-			echo '<input type="text" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'" size="90"/></p>';
-            echo '<p><label for="email_archive_text">' . $lang['text'] . ':</label>'."\n";
             
             $signature = Common::getEmailSignature();
 			echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n";
-            echo '</div>';
+            
             
 			echo '<script type="text/javascript">'."\n";
 			echo 'if ($("#email_archive_text")) {'."\n";
 			echo ' 	create_editor(\'email_archive_text\', false);'."\n";
 			echo '}'."\n";
             echo '</script>'."\n";
-            
-			echo '</div>'."\n";
-			#gumbi
+
+			echo '</div>'; #left
+
 			echo '<div id="div_archives_email_right" >'."\n";
+            
+			//Navodila
+			echo '<div class="message_instructions">';
+            
+			echo '<p class="bold caps bottom32">'.$lang['srv_alert_instruction1'].'</p>';
+            echo '<p class="bottom32">'.$lang['srv_alert_instruction1c'].'</p>';
 			
-			echo '<div id="div_archives_email_buttons">';
-	        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_do_send_mail'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</span></a></span></span>'."\n";
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-			echo '<br class="clr" />';
+			echo '<div class="sistemske">';
+			echo '<p>'.$lang['srv_alert_instruction_link_archive'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_url_archive'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_name_archive'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_survey'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_date'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_site'].'</p>';
 			echo '</div>';
-
-
-			echo '<div id="div_error">';
-			# navodila
-			echo $lang['srv_analiza_arhiviraj_mail_note_0'];
-			echo '</div>';
-			echo '<br/>';
-			echo '<br/>';
 			
-			echo '<div id="div_error">';
-			# navodila
-			echo $lang['srv_analiza_arhiviraj_mail_note_1'];
 			echo '</div>';
 			
 			echo '</div>'; //right
 
 			echo '</div>'; //wrap
+			
+			#gumbi
+			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';              
+			echo '<button class="medium blue" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</button>';
+			echo '</div>';
+
 		} else {
 			self::DisplayError($CAE);
 		}
-        echo '</div>'."\n"; // end div_analiza_archive_name
+        echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function SendEmailArchive($aid = null, $subject, $text, $emails) {
 		global $lang, $site_url, $site_path, $global_user_id;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
+        echo '<div id="div_analiza_archive_name">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
-		echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
+		echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
 		
 		$CAE = self::CheckArchiveExistance($aid); 
 		if ( $CAE > 0) {
@@ -652,13 +657,15 @@ class SurveyAnalysisArchive {
 				echo 'Pri pošiljanju e-mailov je prišlo do napake!';
 			}
 			
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-			echo '<br class="clr" />';
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
+			echo '</div>';
+
 		} else {
 			self::DisplayError($CAE);
 		}
 		
-		echo '</div>'."\n"; // end div_analiza_archive_name
+		echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function EditArchive($aid) {
@@ -984,8 +991,9 @@ class SurveyAnalysisArchive {
 		echo '</div>';
 		
 		if ($showButton) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-			echo '<br class="clr" />';
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
+			echo '</div>';
 		}
 	}
         
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index 29e775814..d5a15b7df 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -965,7 +965,7 @@ function createArchiveBeforeEmail() {
 		if (parseInt(response) > 0) {
 			var aid = parseInt(response);
 			$("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() {
-				$('#fullscreen').addClass("PopUpNarrow divPopUp").show();
+				$('#fullscreen').addClass("divPopUp").show();
 			});
 		} else {
 			if (parseInt(response) == -1) {
diff --git a/lang/1.php b/lang/1.php
index 10e9da554..10c07a829 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3733,8 +3733,12 @@ $lang = array (
 	"srv_alert_instruction1"					=>	"Navodila za oblikovanje sporočil",
 	"srv_alert_instruction1a"					=>	"Legenda spremenljivk iz baze",
 	"srv_alert_instruction1b"					=>	"V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
+	"srv_alert_instruction1c"					=>	"Uporabite lahko naslednje spremenljivke:",
 	"srv_alert_instruction2"					=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
 	"srv_alert_instruction_name"				=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
+	"srv_alert_instruction_link_archive"		=>	"[LINK] - HTML povezava do arhiva",
+	"srv_alert_instruction_name_archive"		=>	"[NAME] - ime uporabnika (iz baze CMS)",
+	"srv_alert_instruction_URL_archive"			=>	"[URL] - URL povezava do arhiva",
 	"srv_alert_instruction_survey"				=>	"[SURVEY] - ime ankete",
 	"srv_alert_instruction_date"				=>	"[DATE] - datum",
 	"srv_alert_instruction_site"				=>	"[SITE] - povezava do ankete",
@@ -4099,8 +4103,8 @@ $lang = array (
 	"srv_analiza_arhiviraj_ime"				=>	"Ime arhiva",
 	"srv_analiza_archive_note"				=>	"Opomba",
 	"srv_analiza_archive_access"			=>	"Dostop",
-	"srv_analiza_archive_message_note"		=>	"Sporo&#269;ilo ob kreaciji arhiva ankete",
-	"srv_analiza_archive_message_emails"	=>	"Elektronski naslovi",
+	"srv_analiza_archive_message_note"		=>	"Sporočilo ob kreaciji arhiva ankete",
+	"srv_analiza_archive_message_emails"	=>	"Vnesite e-poštne naslove prejemnikov (vsak prejemnik naj bo v svoji vrstici):",
 	"srv_analiza_archive_access_all"		=>	"Vsi",
 	"srv_analiza_archive_access_admins"		=>	"Administratorji ankete",
 	"srv_analiza_archive_access_password"	=>	"Z geslom",
diff --git a/lang/2.php b/lang/2.php
index d0f901e70..1ee4c8d64 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3701,8 +3701,12 @@ $lang = array (
 	"srv_alert_instruction1"		=>	"Instructions for message formatting",
 	"srv_alert_instruction1a"		=>	"Legend of database variables",
 	"srv_alert_instruction1b"		=>	"You can also use system variables in the message which are currently not in the survey",
+	"srv_alert_instruction1c"		=>	"You can use the following variables:",
 	"srv_alert_instruction2"		=>	" [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ",
 	"srv_alert_instruction_name"	=>	" [NAME] => user name (from the database (CMS)) or system variable \"name\"",
+	"srv_alert_instruction_link_archive"		=>	"[LINK] - HTML link to the archive",
+	"srv_alert_instruction_URL_archive"		=>	"[URL] - URL link the archive",
+	"srv_alert_instruction_name_archive"		=>	"[NAME] - username (from the CMS database)",
 	"srv_alert_instruction_survey"	=>	"[SURVEY] => survey name",
 	"srv_alert_instruction_date"	=>	"[DATE] => date",
 	"srv_alert_instruction_site"	=>	"[SITE] => link to survey",
@@ -4081,7 +4085,7 @@ $lang = array (
 	"srv_analiza_archive_note"				=>	"Note",
 	"srv_analiza_archive_access"			=>	"Access",
 	"srv_analiza_archive_message_note"		=>	"Message on the creation of an survey analysis archive",
-	"srv_analiza_archive_message_emails"	=>	"Emails",
+	"srv_analiza_archive_message_emails"	=>	"Enter the recipients' email addresses (each email should be in its own line):",
 	"srv_analiza_archive_access_all"		=>	"All",
 	"srv_analiza_archive_access_admins"		=>	"Only admins of survey",
 	"srv_analiza_archive_access_password"	=>	"With password",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7dd8d77a9..8be8938b4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8313,14 +8313,6 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
   width: 50%;
 }
 
-#div_archives_email_left {
-  width: 75%;
-}
-
-#div_archives_email_right {
-  width: 25%;
-}
-
 #creport_profiles {
   cursor: pointer;
   width: 99%;
@@ -8594,6 +8586,36 @@ div#mc_table_settings form {
   padding: 0;
 }
 
+div#div_analiza_archive_name {
+  width: 900px !important;
+}
+div#div_analiza_archive_name div.setting_holder textarea.email {
+  height: 60px !important;
+}
+div#div_analiza_archive_name div#div_archives_email_wrap {
+  display: flex;
+  flex-direction: row;
+  gap: 16px;
+  margin-top: 4px;
+}
+div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_left {
+  width: 60%;
+}
+div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right {
+  min-height: 100% !important;
+}
+div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions {
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  box-sizing: border-box;
+  padding: 16px;
+  width: 100%;
+  min-height: 100% !important;
+}
+div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions div.sistemske p {
+  margin-bottom: 4px;
+}
+
 /* 
     Header scss - top line, menu...
 */
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index a64df4937..4bdefabce 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -223,14 +223,6 @@ div#div_analiza_archive_name {
     }
 }
 
-//Pošji arhiv
-#div_archives_email_left {
-	width: 75%;
-}
-#div_archives_email_right {
-	width: 25%;
-}
-
 //Poročila
 #creport_profiles {
     cursor: pointer;
@@ -590,3 +582,50 @@ div#mc_table_settings {
         padding: 0;
     }
 }
+
+//Pošilji arhiv
+div#div_analiza_archive_name {
+    width: 900px !important;
+
+    div.setting_holder {
+                
+        textarea.email {
+            height: 60px !important;
+        }
+    }
+
+    div#div_archives_email_wrap {
+        display: flex;
+        flex-direction: row;
+        gap: 16px;
+
+        margin-top: 4px;
+
+        div#div_archives_email_left {
+
+            width: 60%;
+            
+        }
+
+        div#div_archives_email_right {
+            min-height: 100% !important;
+
+            div.message_instructions {
+                background-color: $light-gray;
+                border: 1px solid $gray;
+                box-sizing: border-box;
+                padding: 16px;
+                width: 100%;
+
+                min-height: 100% !important;
+
+                div.sistemske {
+                    p {
+                        margin-bottom: 4px;
+                    }
+                }
+
+            }
+        }
+    }
+}