diff --git a/lib/web/account.js b/lib/web/account.js
index 1a6e425f..5692a7f8 100644
--- a/lib/web/account.js
+++ b/lib/web/account.js
@@ -606,7 +606,7 @@ function handlePasswordReset(req, res) {
                 text: msg
             };
 
-            Config.get("nodemailer").sendMail(mail, function (err, response) {
+            Config.get("mail.nodemailer").sendMail(mail, function (err, response) {
                 if (err) {
                     Logger.errlog.log("mail fail: " + err);
                     sendJade(res, "account-passwordreset", {
diff --git a/templates/channel.jade b/templates/channel.jade
index cb1c78f6..551d6eed 100644
--- a/templates/channel.jade
+++ b/templates/channel.jade
@@ -43,7 +43,7 @@ html(lang="en")
                 span#modflair.label.label-default.pull-right.pointer M
                 span#adminflair.label.label-default.pull-right.pointer A
               #userlist
-              #messagebuffer
+              #messagebuffer.linewrap
               input#chatline.form-control(type="text", maxlength="240", style="display: none")
               #guestlogin.input-group
                 span.input-group-addon Guest login