diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 786f226cb..a97d9c2b5 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7127,6 +7127,10 @@ class SurveyAdminSettings {
 				elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
 				else echo '<span>';*/
 
+				echo '<div class="by">';
+				echo 'Respondent '.$lang['srv_comments_user2'];
+				echo '</div>';
+
 				$datetime = strtotime($row['comment_time']);
 				$datetime = date("d.m.Y G:i", $datetime);
 				
@@ -7167,7 +7171,10 @@ class SurveyAdminSettings {
 					echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>';	*/
 					
 					if ($row['ocena']==0) {
-						echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
+						echo $rowa['id'];
+						echo $row['id'];
+						echo 'test2';
+						echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
 						echo $lang['srv_comments_archive'].'</p>';
 					}
 					else {
@@ -7813,7 +7820,7 @@ class SurveyAdminSettings {
                                         } else {
 
 											if ($row['ocena']==0) {
-												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
+												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
 												echo $lang['srv_comments_archive'].'</p>';
 											}
 											else {
@@ -7821,8 +7828,8 @@ class SurveyAdminSettings {
 											}
                                         }
                                         
-										echo '<div class="reply_to">';
-                                        echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
+										echo '<div class="reply_to" onClick="$(\'#comment_toggle_'.$spr_id.'_4\').toggle();">';
+                                        echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
 										echo '</div>';
 
                                         echo '</div>';
@@ -7839,10 +7846,19 @@ class SurveyAdminSettings {
 						}
 
 						if ($addfieldposition == '' || $addfieldposition == 0) {
+
+							echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
+							echo '<span class="faicon link-right comments"></span>';
+							echo $lang['srv_add_comment_toggle'];
+							echo '</div>';
+
+							echo '<div class="comment_wrapper" id="comment_wrapper_'.$spr_id.'_'.'4'.'">';
+
 							echo '<div class="new_comment" id="survey_comment_'.$spr_id.'_'.'4'.'">';
 							$ba = new BranchingAjax($this->anketa);
 							$ba->add_comment_field($spr_id, '1', '4', false);
 							echo '</div>';
+							echo '</div>';
 						}
 
 						echo '</div>';
@@ -7880,6 +7896,10 @@ class SurveyAdminSettings {
 									if(mysqli_num_rows($sqlTime) > 0){
 										
 										$rowTime = mysqli_fetch_array($sqlTime);
+
+										echo '<div class="by">';
+										echo 'Respondent '.$lang['srv_comments_user2'];
+										echo '</div>';
 									
 										if ( strpos($rowt['text'], '__DATE__') !== false ) {
 											$rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']);
diff --git a/admin/survey/script/js-lang.php b/admin/survey/script/js-lang.php
index ebc8ab723..42efc0c19 100644
--- a/admin/survey/script/js-lang.php
+++ b/admin/survey/script/js-lang.php
@@ -197,6 +197,8 @@ lang('srv_vrednost_correct');
 lang('srv_editor_title');
 lang('srv_comments_new');
 lang('srv_comment_comment');
+lang('edit1338');
+lang('for');
 
 
 //LOKACIJA
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 4741f13df..39f8eeff7 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -735,10 +735,14 @@ function get_editor_close(id) {
 
 
 // prikaze field da manager doda nek komentar obstojecemu komentarju na vprasanje
-function comment_on_comment (id) {
+function comment_on_comment (id, user, date, spr_id) {
 	$('#comment_on_comment_'+id).html(
+		'<div class="reply_to_who"><span class="faicon fa-reply link-right"></span>'+lang['for']+': '+user+' ('+date+')</div>'+
 		'<textarea name="vsebina" placeholder="'+lang['srv_comment_comment']+'" id="vsebina_comment_on_comment_'+id+'"></textarea>' +
-		'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'
+		'<div class="button_holder bottom0">'+
+		'<button class="medium white-blue" onclick="$(\'#comment_on_comment_'+id+'\').html(\'\'); $(\'#comment_toggle_'+spr_id+'_4\').toggle(); return false;">'+lang['edit1338']+'</button>'+
+		'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
+		'</div>'
 	);
 }
 
diff --git a/lang/1.php b/lang/1.php
index 83535632a..d1d124a36 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -622,6 +622,7 @@ $lang = array (
 	"threads"			=>	"Tem",
 	"new_thread"			=>	"Nova tema",
 	"reply"				=>	"Odgovori",
+	"for"				=>	"Za",
 	"guest"				=>	"Gost",
 	"askdelforum"			=>	"Ali ste prepri&#269;ani, da zelite izbrisati forum? Izbrisali boste tudi vse teme v tem forumu!",
 	"newforum"			=>	"Nov forum",
diff --git a/lang/2.php b/lang/2.php
index 8b41d6cb1..4cdd61c62 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -609,6 +609,7 @@ $lang = array (
 	"threads"		=>	"Threads",
 	"new_thread"		=>	"Add thread",
 	"reply"			=>	"Reply",
+	"for"				=>	"For",
 	"guest"			=>	"Guest",
 	"askdelforum"		=>	"Are you sure you want to delete this forum? You will also delete all threads in this forum!",
 	"newforum"		=>	"New forum",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index bcafa6915..8469c0c5e 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -22002,24 +22002,35 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .reply_to a {
   text-decoration: none;
 }
-div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text,
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_wrapper,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_wrapper {
+  display: none;
+  transition: 0.3s;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.new_comment,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment {
+div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text {
   display: flex;
   flex-direction: column;
 }
-div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text textarea,
+div.page_komentarji ul div.question_comment_holder div.question_comment div.new_comment div.reply_to_who,
+div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text div.reply_to_who,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment div.reply_to_who,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text div.reply_to_who {
+  color: #808080;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.new_comment textarea,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text textarea,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment textarea {
+div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text textarea,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment textarea,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text textarea {
   width: 100%;
   height: 100px;
 }
-div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text button,
 div.page_komentarji ul div.question_comment_holder div.question_comment div.new_comment button,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text button,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment button {
+div.page_komentarji ul div.question_comment_holder div.question_comment div.reply_to_text button,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.new_comment button,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.reply_to_text button {
   width: fit-content;
   margin-top: 8px;
 }
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index bf629fdab..82cee4673 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -207,11 +207,20 @@ div.page_komentarji_anketa {
                     }
                 }
 
-                div.reply_to_text,
-                div.new_comment {
+                div.comment_wrapper {
+                    display: none;
+                    transition: 0.3s;
+                }
+
+                div.new_comment,
+                div.reply_to_text {
                     display: flex;
                     flex-direction: column;
 
+                    div.reply_to_who {
+                        color: $very-dark-gray2;
+                    }
+
                     textarea {
                         width: 100%;
                         height: 100px;
@@ -222,9 +231,7 @@ div.page_komentarji_anketa {
                         margin-top: 8px;
                     }
                 }
-
             }
-
         }
     }
 }