diff --git a/css/style.css b/css/style.css
index 27ad9f1..6b6a8ee 100644
--- a/css/style.css
+++ b/css/style.css
@@ -654,12 +654,17 @@ textarea.splited-post {
     font-size: 11px;
     margin: 4px 0;
     padding: 4px;
+    word-wrap: break-word;
 }
 
 #post-preview a {
     color: #E34F42;
 }
 
+#post-preview samp {
+    background-color: #F0EFCC;
+}
+
 .splited-post-counter {
     color: rgba(0, 0, 0, 0.3);
     font-weight: bold;
@@ -1045,7 +1050,7 @@ ol.toptrends-list {
 }
 
 .post-text samp {
-    background: #f0efcc;
+    background-color: #F0EFCC;
 }
 
 .post-context
diff --git a/js/interface_common.js b/js/interface_common.js
index 40252a5..ee8e95f 100644
--- a/js/interface_common.js
+++ b/js/interface_common.js
@@ -704,10 +704,12 @@ function replyTextInput(event) {
             }
         }
 
-        if (textArea[0].value.length)
-            textAreaForm.find('#post-preview').html(htmlFormatMsg(textArea[0].value, [])).show();
-        else
-            textAreaForm.find('#post-preview').html('').hide();
+        if ($.Options.postPreview.val) {
+            if (textArea[0].value.length)
+                textAreaForm.find('#post-preview').html(htmlFormatMsg(textArea[0].value, [])).show();
+            else
+                textAreaForm.find('#post-preview').html('').hide();
+        }
     }
 
     function getPostSplitingPML() {
@@ -1276,9 +1278,7 @@ function postSubmit(e, oldLastPostId) {
     var remainingCount = tweetForm.find('.post-area-remaining');
     remainingCount.text(140);
 
-    if ($this.parents('.modal-wrapper').length)
-        closeModal();
-    else if ($this.parents('.prompt-wrapper').length)
+    if ($this.parents('.prompt-wrapper').length)
         closeModalHandler('.prompt-wrapper');
 
     if ($this.closest('.post-area,.post-reply-content')) {
diff --git a/theme_calm/css/style.css b/theme_calm/css/style.css
index 6183598..6e3933b 100644
--- a/theme_calm/css/style.css
+++ b/theme_calm/css/style.css
@@ -783,6 +783,11 @@ textarea.splited-post {
     font-size: 11px;
     margin: 4px 0;
     padding: 4px;
+    word-wrap: break-word;
+}
+
+#post-preview samp {
+    background-color: #EEE;
 }
 
 .splited-post-counter {
@@ -1247,7 +1252,7 @@ textarea.splited-post {
 }
 
 .post-text samp {
-    background: #eee;
+    background: #EEE;
 }
 
 .post-context
diff --git a/theme_nin/css/style.css b/theme_nin/css/style.css
index c5e3673..e0d724f 100644
--- a/theme_nin/css/style.css
+++ b/theme_nin/css/style.css
@@ -879,7 +879,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
 }
 
 .post-text samp {
-    background: #eee;
+    background-color: #EEE;
 }
 
 /* line 138, ../sass/_postboard.sass */
@@ -2276,6 +2276,7 @@ textarea.splited-post {
     font-size: 12px;
     margin: 4px 0;
     padding: 4px;
+    word-wrap: break-word;
 }
 
 #post-preview a {
@@ -2286,6 +2287,10 @@ textarea.splited-post {
     color: #B4C669;
 }
 
+#post-preview samp {
+    background-color: #EEE;
+}
+
 /* line 384, ../sass/style.sass */
 .splited-post-counter {
   color: rgba(0, 0, 0, 0.3);
diff --git a/theme_nin/sass/_postboard.sass b/theme_nin/sass/_postboard.sass
index 61bdd00..8b599da 100755
--- a/theme_nin/sass/_postboard.sass
+++ b/theme_nin/sass/_postboard.sass
@@ -135,7 +135,7 @@
     min-height: 25px
     padding: 0
     samp
-        background: #eee
+        background-color: #EEE
 
 .post-context
     font-size: 11px
diff --git a/theme_nin/sass/style.sass b/theme_nin/sass/style.sass
index 094055f..8e29cc2 100755
--- a/theme_nin/sass/style.sass
+++ b/theme_nin/sass/style.sass
@@ -360,10 +360,13 @@ ul.userMenu-search-profiles
   font-size: 12px
   margin: 4px 0
   padding: 4px
+  word-wrap: break-word
   a
     color: #AAA
   a:hover
     color: $color-green
+  samp
+    background-color: #EEE
 
 #postboard-top
   clear: both