diff --git a/admin/survey/classes/class.Notifications.php b/admin/survey/classes/class.Notifications.php
index 46404e3b6..9fe657420 100644
--- a/admin/survey/classes/class.Notifications.php
+++ b/admin/survey/classes/class.Notifications.php
@@ -22,23 +22,33 @@ class Notifications {
 		// Prikazemo poslana sporocila
 		if((isset($_GET['t']) && $_GET['t']=='sent') || $tab == 1){
 
-			echo '<div class="title">';
-			echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
-			echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
-			echo '</div>';
-
 			echo '<div class="notifications_content">';
 
 			// Izpis vseh poslanih sporocil
 			if($admin_type == 0){
 				echo '<div class="notifications_content_left">';
+				
+				echo '<div class="title">';
+				echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
+				echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
+				echo '</div>';
+				
 				echo '<div class="sent_list">';
 				$this->displaySentMessages();
 				echo '</div>';
 				echo '</div>';
 				
 				// obrazec za posiljanje sporocil
+				echo '<div class="notifications_content_right">';
+				
+				echo '<div class="title">';
+				echo '<div class="title_icon"><span class="faicon inv_sent_0"></span></div>';
+				echo '<h2>'.$lang['srv_inv_message_draft_new'].'</h2>';
+				echo '</div>';
+
 				$this->sendMessageForm();
+				echo '</div>';
+
 			}
 			else
 				echo $lang['srv_notifications_admin_alert'];
@@ -103,7 +113,6 @@ class Notifications {
 			$sentMessages[$row['id']] = $row;
 		}
 		
-		
 		echo '<ul>';
 		
 		if(count($sentMessages) > 0){
@@ -120,7 +129,7 @@ class Notifications {
 				echo '</div>';
 				echo '</div>';
 				
-				$text = strip_tags((strlen($message['text']) > 60) ? substr($message['text'], 0, 60).'...' : $message['text']);
+				$text = strip_tags((strlen($message['text']) > 76) ? substr($message['text'], 0, 76).'...' : $message['text']);
 				echo '<div class="content">';
 				echo $text;
 				echo '</div>';
@@ -145,24 +154,46 @@ class Notifications {
 		global $admin_type, $global_user_id, $lang;
 		
 		echo '<div class="send_form">';
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_reciever'].': </span><input type="text" name="recipient" id="recipient">';
-		
-		// Checkboxa za posiljenje vsem uporabnikoom (slo in ang)
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_slo" id="recipient_all_slo" onClick="recipient_all_disable_email();"> <label for="recipient_all_slo"><span class="clr bold">'.$lang['srv_notifications_send_all_slo'].'</span></label></div>';
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_ang" id="recipient_all_ang" onClick="recipient_all_disable_email();"> <label for="recipient_all_ang"><span class="clr bold">'.$lang['srv_notifications_send_all_ang'].'</span></label></div><br />';
+
+		//Prejemniki
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_notifications_send_reciever2'].':</span>';
+
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_all_slo" id="recipient_all_slo" onChange="recipient_toggle(\'slo\');">';
+		echo '<label for="recipient_all_slo">'.$lang['srv_notifications_send_all_slo'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_all_ang" id="recipient_all_ang" onChange="recipient_toggle(\'ang\');">';
+		echo '<label for="recipient_all_ang">'.$lang['srv_notifications_send_all_ang'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_custom" id="recipient_custom" onChange="recipient_toggle(\'custom\');">';
+		echo '<label for="recipient_custom">'.$lang['srv_notifications_send_custom'].'</label>';
+		echo '<input type="text" class="text large disabled" name="recipient" id="recipient">';
+		echo '</div>';
+					
+		echo '</div>';
 
         // Naslov sporocila
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_title'].': </span><input type="text" name="title"><br /><br />';
+		echo '<div class="setting_holder">';
+		echo $lang['srv_notifications_send_title'].':';
+		echo '<input type="text" class="text large" name="title">';
+		echo '</div>';
 
         // Besedilo sporocila (editor)
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_text'].': </span><textarea id="notification" name="notification" autocomplete="off"></textarea><br />';
+		echo '<label>'.$lang['srv_notifications_send_text'].':</label>';
+		echo '<textarea id="notification" name="notification" autocomplete="off"></textarea>';
 		
 		// Avtomatsko prikaži obvestilo po prijavi
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="force_show" id="force_show"> <label for="force_show"><span class="clr bold">'.$lang['srv_notifications_force_show'].'</span></label></div><br />';
-		
-		echo '<span class="buttonwrapper floatLeft spaceRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendNotification(); return false;">';
-		echo '<span>'.$lang['srv_notifications_send'].'</span>';
-		echo '</a></span>';
+		echo '<div class="auto_checkbox">';
+		echo '<input type="checkbox" value="1" name="force_show" id="force_show">';
+		echo '<label for="force_show">'.$lang['srv_notifications_force_show'].'</label>';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+		echo '<button class="medium blue" onclick="sendNotification(); return false;">'.$lang['srv_notifications_send'].'</button>';
+		echo '</div>';
 		
 		if($note != ''){
 			echo '<br /><br />';
@@ -309,15 +340,34 @@ class Notifications {
 			}
 		}
 		
+		echo '<div class="notifications_content">';
+
 		// Refresh vseh poslanih sporocil
+		echo '<div class="notifications_content_left">';
+				
+		echo '<div class="title">';
+		echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
+		echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
+		echo '</div>';
+
 		echo '<div class="sent_list">';
 		$this->displaySentMessages();
 		echo '</div>';
+		echo '</div>';
 		
 		// Refresh obrazca za posiljanje sporocil
+
+		echo '<div class="notifications_content_right">';
+				
+		echo '<div class="title">';
+		echo '<div class="title_icon"><span class="faicon inv_sent_0"></span></div>';
+		echo '<h2>'.$lang['srv_inv_message_draft_new'].'</h2>';
+		echo '</div>';
+
 		$this->sendMessageForm($note);
-		
-		echo '<div class="clr"></div>';
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	public function ajax_resolveMessages(){
diff --git a/admin/survey/script/notifications.js b/admin/survey/script/notifications.js
index 5c4cfe170..ffd88efc9 100644
--- a/admin/survey/script/notifications.js
+++ b/admin/survey/script/notifications.js
@@ -73,23 +73,31 @@ function closeUnreadMessages(){
 	$("#unread_notifications").fadeOut();
 }
 
-function recipient_all_disable_email(){
-	
-	if ($( "input[name='recipient_all_slo']" ).is(':checked'))
-		var recipient_all_slo = 1;
-	else
-		var recipient_all_slo = 0;
-		
-	if ($( "input[name='recipient_all_ang']" ).is(':checked'))
-		var recipient_all_ang = 1;
-	else
-		var recipient_all_ang = 0;
-		
-	if(recipient_all_slo == 0 && recipient_all_ang == 0)
-		$("#recipient").attr('disabled', false);
-	else
-		$("#recipient").attr('disabled', true);
+function recipient_toggle(type){
+
+	if (type == 'slo') {
+		if ($( "input[name='recipient_all_slo']" ).is(':checked')) {
+			$( "input[name='recipient_custom']" ).attr("checked", false);
+			$("#recipient").addClass('disabled');
+		}
+	}
+
+	if (type == 'ang') {
+		if ($( "input[name='recipient_all_ang']" ).is(':checked')) {
+			$( "input[name='recipient_custom']" ).attr("checked", false);
+			$("#recipient").addClass('disabled');
+		}
+	}
+
+	if (type == 'custom') {
+		if ($( "input[name='recipient_custom']" ).is(':checked')) {
+			$( "input[name='recipient_all_slo']" ).attr("checked", false);
+			$( "input[name='recipient_all_ang']" ).attr("checked", false);
+			$("#recipient").removeClass('disabled');
+		}
+	}
 }
+	
 
 
 // Prikaze popup z neprebranimi sporocili
diff --git a/lang/1.php b/lang/1.php
index 717078db9..3846c3f04 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7198,13 +7198,15 @@ $lang = array (
 	'srv_notifications_unread'					=>	"Neprebrana sporočila",
 	'srv_notifications_alert'					=>	"Imate novo neprebrano sporočilo!",
 	'srv_notifications_admin_alert'				=>	"Pošiljanje je omogočeno samo administratorjem!",
-	'srv_notifications_send_reciever'			=>	"Prejemnik (e-pošta)",
+	'srv_notifications_send_reciever2'			=>	"Prejemnik (e-pošta)",
+	'srv_notifications_send_reciever2'			=>	"Prejemniki",
 	'srv_notifications_send_title'				=>	"Naslov",
 	'srv_notifications_send_text'				=>	"Besedilo",
 	'srv_notifications_send'					=>	"Pošlji",
 	'srv_notifications_save_send'				=>	"Shrani in pošlji",
-	'srv_notifications_send_all_slo'			=>	"Pošlji vsem slovenskim uporabnikom",
-	'srv_notifications_send_all_ang'			=>	"Pošlji vsem angleškim uporabnikom",
+	'srv_notifications_send_all_slo'			=>	"Vsi slovenski uporabniki",
+	'srv_notifications_send_all_ang'			=>	"Vsi angleški uporabniki",
+	'srv_notifications_send_custom'				=>	"E-poštni naslov po meri:",
 	'srv_notifications_force_show'				=>	"Prikaži obvestilo avtomatsko po prijavi",
 	'slider_min_label_note'						=>	"Labela za Min",
 	'slider_max_label_note'						=>	"Labela za Max",
diff --git a/lang/2.php b/lang/2.php
index 7178a2838..eb3dba08d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7082,12 +7082,14 @@ $lang = array (
 	'srv_notifications_alert'					=>	"You have new unread message!",
 	'srv_notifications_admin_alert'				=>	"Only administrator can send a notification!",
 	'srv_notifications_send_reciever'			=>	"Recipient (e-mail)",
+	'srv_notifications_send_reciever2'			=>	"Recipients",
 	'srv_notifications_send_title'				=>	"Subject",
 	'srv_notifications_send_text'				=>	"Message",
 	'srv_notifications_send'					=>	"Send",
 	'srv_notifications_save_send'				=>	"Save and send",
-	'srv_notifications_send_all_slo'			=>	"Send to all slovenian users",
-	'srv_notifications_send_all_ang'			=>	"Send to all english users",
+	'srv_notifications_send_all_slo'			=>	"All Slovenian users",
+	'srv_notifications_send_all_ang'			=>	"All English users",
+	'srv_notifications_send_custom'				=>	"Custom e-mail address:",
 	'srv_notifications_force_show'				=>	"Show notification automatically after login",
 	'slider_min_label_note'						=>	"Min's label",
 	'slider_max_label_note'						=>	"Max's label",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 0ee7ef6ed..0dc454671 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6695,13 +6695,10 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  font-size: 14px;
   content: "\f2b6";
-  font-weight: 400;
 }
 
 span.faicon.inv_sent_1::before {
-  font-size: 14px;
   content: "\f0e0";
 }
 
@@ -15112,7 +15109,7 @@ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_
   margin-bottom: 16px;
 }
 fieldset #obvescanje_sidebyside_holder label {
-  cursor: default;
+  cursor: text;
 }
 fieldset #obvescanje_sidebyside_holder label.bottom4 {
   margin-bottom: 4px;
@@ -22475,6 +22472,7 @@ div.page_obvestila div.title div.title_icon {
   align-items: center;
   justify-content: center;
   margin-right: 8px;
+  box-sizing: border-box;
 }
 div.page_obvestila div.title h2 {
   width: 100%;
@@ -22503,7 +22501,7 @@ div.page_obvestila #notifications .notifications_content {
 div.page_obvestila #notifications .notifications_content .notifications_content_left {
   display: flex;
   flex-direction: column;
-  height: 660px;
+  height: 694px;
   box-sizing: border-box;
   width: 50%;
 }
@@ -22513,8 +22511,10 @@ div.page_obvestila #notifications .notifications_content .notifications_content_
 }
 div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul {
   padding-left: 0;
+  margin-block-start: 0;
 }
 div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li {
+  box-sizing: border-box;
   list-style-type: none;
   margin: 0;
   padding: 16px;
@@ -22574,6 +22574,50 @@ div.page_obvestila #notifications .notifications_content .notifications_content_
   cursor: pointer;
   border: 1px #1E88E5 solid;
 }
+div.page_obvestila #notifications .notifications_content .notifications_content_right {
+  display: flex;
+  flex-direction: column;
+  height: 694px;
+  box-sizing: border-box;
+  width: 50%;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form .setting_holder {
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form .setting_holder:last-of-type {
+  margin-bottom: 0;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form .setting_holder .setting_item {
+  margin-top: 8px;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form .setting_holder .setting_item label {
+  margin-right: 8px;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form .setting_holder .setting_item input.text {
+  width: 250px;
+  height: 28px;
+  padding: 3px 5px;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form input.text {
+  width: 100%;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form label {
+  margin-bottom: 4px;
+  cursor: text;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form textarea {
+  width: 100%;
+  padding: 3px 5px;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form div.auto_checkbox {
+  margin-top: 16px;
+}
+div.page_obvestila #notifications .notifications_content .notifications_content_right .send_form div.button_holder {
+  margin-top: 32px;
+  margin-bottom: 0;
+}
 div.page_obvestila #notifications .notifications_content #message {
   display: inline;
   float: left;
@@ -22583,28 +22627,6 @@ div.page_obvestila #notifications .notifications_content #message {
   background-color: #1E88E5;
   border: 1px #E5E5E5 solid;
 }
-div.page_obvestila #notifications .notifications_content .send_form {
-  display: inline;
-  float: left;
-  margin-top: 30px;
-  padding: 20px;
-  width: 415px;
-  background-color: #1E88E5;
-  border: 1px #E5E5E5 solid;
-  color: #333333 !important;
-}
-div.page_obvestila #notifications .notifications_content .send_form input[type=text] {
-  width: 400px;
-  padding: 3px 5px;
-  border: 1px solid #E5E5E5 !important;
-  color: #333333 !important;
-}
-div.page_obvestila #notifications .notifications_content .send_form textarea {
-  width: 400px;
-  padding: 3px 5px;
-  border: 1px solid #E5E5E5 !important;
-  color: #333333 !important;
-}
 div.page_obvestila #new_notification_alert {
   cursor: pointer;
   position: absolute;
diff --git a/resources/sass/admin_new/basic/icons/invitation.scss b/resources/sass/admin_new/basic/icons/invitation.scss
index 8845bee16..0a50cef3a 100644
--- a/resources/sass/admin_new/basic/icons/invitation.scss
+++ b/resources/sass/admin_new/basic/icons/invitation.scss
@@ -11,12 +11,9 @@ and open the template in the editor.
 
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-	font-size: 14px;
 	content: "\f2b6";
-    font-weight: 400;
 }
 span.faicon.inv_sent_1::before {
-	font-size: 14px;
 	content: "\f0e0";
 }
 span.faicon.inv_responded_0::before {
diff --git a/resources/sass/admin_new/pages/sporocila/sporocila.scss b/resources/sass/admin_new/pages/sporocila/sporocila.scss
index 9a8c3b208..c44bcdf0c 100644
--- a/resources/sass/admin_new/pages/sporocila/sporocila.scss
+++ b/resources/sass/admin_new/pages/sporocila/sporocila.scss
@@ -20,6 +20,8 @@ div.page_obvestila {
             justify-content: center;
 
             margin-right: 8px;
+
+            box-sizing: border-box;
         }
     
         h2 {
@@ -56,7 +58,7 @@ div.page_obvestila {
             .notifications_content_left {
                 display: flex;
                 flex-direction: column;
-                height: 660px;
+                height: 694px;
                 box-sizing: border-box;
                 width: 50%;
 
@@ -67,7 +69,9 @@ div.page_obvestila {
                     
                     ul {
                         padding-left: 0;
+                        margin-block-start: 0;
                         li {
+                            box-sizing: border-box;
                             list-style-type: none;
                             margin: 0;
                             padding: 16px;
@@ -105,7 +109,7 @@ div.page_obvestila {
                     }
                 }
 
-                //Prejeta sporočila
+                //Prejeta sporočila - še stari styling
                 .recieved_list {
                     display: inline;
                     float: left;
@@ -139,9 +143,70 @@ div.page_obvestila {
 
             }
 
+            .notifications_content_right {
+
+                display: flex;
+                flex-direction: column;
+                height: 694px;
+                box-sizing: border-box;
+                width: 50%;
+
+                .send_form {
+
+                    .setting_holder {
+                        margin-bottom: 16px;
+                        display: flex;
+                        flex-direction: column;
+
+                        &:last-of-type {
+                            margin-bottom: 0;
+                        }
+
+                        .setting_item {
+                            margin-top: 8px;
+                            
+                            label {
+                                margin-right: 8px;
+                            }
+
+                            input.text {
+                                width: 250px;
+                                height: 28px;
+                                padding: 3px 5px;
+                            }
+                        }
+                    }
+
+                    input.text {
+                        width: 100%;
+                    }
+
+                    label {
+                        margin-bottom: 4px;
+                        cursor: text;
+                    }
+                    
+                    textarea {
+                        width: 100%;
+                        padding: 3px 5px;
+                    }
+
+                    div.auto_checkbox {
+                        margin-top: 16px;
+                    }
+
+                    div.button_holder {
+                        margin-top: 32px;
+                        margin-bottom: 0;
+                    }
+                }
+
+            }
+
 
             
             
+            //// Skopiran stari tari styling
             
             
             #message {
@@ -153,28 +218,6 @@ div.page_obvestila {
                 background-color: $blue;
                         border: 1px $gray solid;
             }
-            .send_form {
-                display: inline;
-                float: left;
-                margin-top: 30px;
-                padding: 20px;
-                width: 415px;
-                background-color: $blue;
-                        border: 1px $gray solid;
-                        color: $black !important;
-                input[type="text"] {
-                    width: 400px;
-                    padding: 3px 5px;
-                    border: 1px solid $gray !important;
-                    color: $black !important;
-                }
-                textarea {
-                    width: 400px;
-                    padding: 3px 5px;
-                    border: 1px solid $gray !important;
-                                color: $black !important;
-                }
-            }
         }
     }
     #new_notification_alert {
diff --git a/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss b/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
index 7fa4feb48..27049af21 100644
--- a/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
+++ b/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
@@ -31,7 +31,7 @@ fieldset{
         }
 
         label{
-            cursor: default;
+            cursor: text;
     
             //Label nad editorjem besedila
             &.bottom4 {