diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 21dff4cf..6a965fa4 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -31,7 +31,7 @@
 
 #new_note {
   .note-text {
-    height:25px;
+    height:40px;
   }
   .attach_holder {
     display:none;
@@ -212,3 +212,8 @@ td .line_note_link {
     }
   }
 }
+
+.note-text { 
+  border: 1px solid #aaa;
+  box-shadow:none;
+}
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index b4e3b962..18ce07a2 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -31,7 +31,7 @@ module GitlabMarkdownHelper
       extractions[$1]
     end
 
-    text.html_safe
+    sanitize text.html_safe
   end
 
   # Use this in places where you would normally use link_to(gfm(...), ...).
diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml
index b6d34a04..8e31b59e 100644
--- a/app/views/notes/_per_line_form.html.haml
+++ b/app/views/notes/_per_line_form.html.haml
@@ -16,7 +16,7 @@
             = f.text_area :note,  size: 255, class: 'line-note-text'
             .note_actions
               .buttons
-                = f.submit 'Add note', class: "btn primary submit_note submit_inline_note", id: "submit_note"
+                = f.submit 'Add note', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
                 = link_to "Cancel", "#", class: "btn hide-button"
               .options
                 %h6.left Notify via email: