diff --git a/app/assets/stylesheets/specific/notes.css.scss b/app/assets/stylesheets/specific/notes.css.scss
index e9694d6e8..17edc4d17 100644
--- a/app/assets/stylesheets/specific/notes.css.scss
+++ b/app/assets/stylesheets/specific/notes.css.scss
@@ -14,6 +14,10 @@ div#note-container {
     z-index: 1500;
     overflow: auto;
     
+    h1, h2, h3, h4, h5, h6, a, span, div, blockquote, br, p, ul, li, ol, em, strong, small, big, b, i, font, u, s {
+      line-height: normal;
+    } 
+    
     p.tn {
       font-size: 0.8em;
       color: gray;
diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 176cbb740..d87efa0bb 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -194,7 +194,7 @@ class DText
     
     Sanitize.clean(
       text,
-      :elements => %w(code center tn h1 h2 h3 h4 h5 h6 a span div blockquote br p ul li ol em strong small big b i font),
+      :elements => %w(code center tn h1 h2 h3 h4 h5 h6 a span div blockquote br p ul li ol em strong small big b i font u s),
       :attributes => {
         "a" => %w(href title style),
         "span" => %w(class style),