diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 3f0fa9b5c..f05938374 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -279,10 +279,6 @@ html, body { height:100%; }
 /* Wrapper div around the text area input */
 #kiwi .controlbox .input .input_wrap { display:inline; }
 
-/* The textarea input */
-#kiwi .controlbox .input .inp { white-space: nowrap; }
-
-
 /* Nick change dialog showed when clicking the nick label */
 #kiwi .controlbox .nickchange {
     position: absolute;
diff --git a/client/assets/themes/basic/style.css b/client/assets/themes/basic/style.css
index ffeb5d8a5..e1f3bc0d5 100644
--- a/client/assets/themes/basic/style.css
+++ b/client/assets/themes/basic/style.css
@@ -486,4 +486,36 @@
 #kiwi .settings_container .settings-category-list a.active {
     border-left: solid 4px #a6c42c;
     color: #36C;
+}
+
+#kiwi ::-webkit-scrollbar {
+    height: 9px;
+    width: 9px;
+}
+#kiwi ::-webkit-scrollbar-button {
+    width: 0;
+    height: 0;
+    display: none;
+}
+#kiwi ::-webkit-scrollbar-corner { background-color:transparent; }
+#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; }
+#kiwi ::-webkit-scrollbar-track:hover {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10);
+}
+#kiwi ::-webkit-scrollbar-track:active {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(0,0,0,0.4);
+    -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25);
+}
+#kiwi ::-webkit-scrollbar-thumb:active {
+    background-color: rgba(0,0,0,0.5);
+    -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35);
 }
\ No newline at end of file
diff --git a/client/assets/themes/cli/style.css b/client/assets/themes/cli/style.css
index c17aab394..0b175d9cf 100644
--- a/client/assets/themes/cli/style.css
+++ b/client/assets/themes/cli/style.css
@@ -467,4 +467,13 @@
 #kiwi .settings_container .settings-category-list a.active {
     border-left: solid 4px #df6b26;
     color: #6d6d6d;
-}
\ No newline at end of file
+}
+
+#kiwi ::-webkit-scrollbar {
+    height: 9px;
+    width: 9px;
+}
+#kiwi ::-webkit-scrollbar-track { background-color:rgba(70,70,70,1); }
+#kiwi ::-webkit-scrollbar-thumb { background-color: rgba(215,215,215,0.4); }
+#kiwi ::-webkit-scrollbar-thumb:hover { background-color: rgba(215,215,215,0.5); }
+#kiwi ::-webkit-scrollbar-thumb:active { background-color: rgba(215,215,215,0.6); }
\ No newline at end of file
diff --git a/client/assets/themes/mini/style.css b/client/assets/themes/mini/style.css
index 7a036a9c8..244155130 100644
--- a/client/assets/themes/mini/style.css
+++ b/client/assets/themes/mini/style.css
@@ -422,4 +422,36 @@
 #kiwi .settings_container .settings-category-list a.active {
     border-left: solid 4px #76bd2b;
     color: #555;
+}
+
+#kiwi ::-webkit-scrollbar {
+    height: 9px;
+    width: 9px;
+}
+#kiwi ::-webkit-scrollbar-button {
+    width: 0;
+    height: 0;
+    display: none;
+}
+#kiwi ::-webkit-scrollbar-corner { background-color:transparent; }
+#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; }
+#kiwi ::-webkit-scrollbar-track:hover {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10);
+}
+#kiwi ::-webkit-scrollbar-track:active {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(0,0,0,0.4);
+    -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25);
+}
+#kiwi ::-webkit-scrollbar-thumb:active {
+    background-color: rgba(0,0,0,0.5);
+    -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35);
 }
\ No newline at end of file
diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css
index 627bc65b2..e39866487 100644
--- a/client/assets/themes/relaxed/style.css
+++ b/client/assets/themes/relaxed/style.css
@@ -590,4 +590,36 @@
 #kiwi .settings_container .settings-category-list a.active {
     border-left: solid 4px #a6c42c;
     color: #36C;
+}
+
+#kiwi ::-webkit-scrollbar {
+    height: 9px;
+    width: 9px;
+}
+#kiwi ::-webkit-scrollbar-button {
+    width: 0;
+    height: 0;
+    display: none;
+}
+#kiwi ::-webkit-scrollbar-corner { background-color:transparent; }
+#kiwi ::-webkit-scrollbar-track { background-clip:padding-box; }
+#kiwi ::-webkit-scrollbar-track:hover {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.10);
+}
+#kiwi ::-webkit-scrollbar-track:active {
+    background-color: rgba(0,0,0,0.05);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.14), inset -1px -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10), inset 0 -1px 0 rgba(0,0,0,0.07);
+}
+#kiwi ::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(0,0,0,0.4);
+    -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.25);
+}
+#kiwi ::-webkit-scrollbar-thumb:active {
+    background-color: rgba(0,0,0,0.5);
+    -webkit-box-shadow: inset 1px 1px 3px rgba(0,0,0,0.35);
 }
\ No newline at end of file
diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index 3725651fc..aa74ce04b 100644
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -63,7 +63,7 @@
                 </div>
                 <div class="input">
                     <span class="nick"> </span>
-                    <div class="input_wrap"><textarea class="inp"></textarea></div>
+                    <div class="input_wrap"><textarea class="inp" wrap="off"></textarea></div>
                     <div class="input_tools"></div>
                 </div>
             </div>