diff --git a/src/bitmessageqt/messageview.py b/src/bitmessageqt/messageview.py
index c322e421..5a964cd4 100644
--- a/src/bitmessageqt/messageview.py
+++ b/src/bitmessageqt/messageview.py
@@ -24,6 +24,11 @@ class MessageView(QtGui.QTextBrowser):
         self.rendering = False
         self.defaultFontPointSize = self.currentFont().pointSize()
         self.verticalScrollBar().valueChanged.connect(self.lazyRender)
+        self.setWrappingWidth()
+
+    def resizeEvent(self, event):
+        super(MessageView, self).resizeEvent(event)
+        self.setWrappingWidth(event.size().width())
     
     def mousePressEvent(self, event):
         #text = textCursor.block().text()
@@ -42,6 +47,12 @@ class MessageView(QtGui.QTextBrowser):
             zoom = self.currentFont().pointSize() * 100 / self.defaultFontPointSize
             QtGui.QApplication.activeWindow().statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Zoom level %1%").arg(str(zoom)))
 
+    def setWrappingWidth(self, width=None):
+        self.setLineWrapMode(QtGui.QTextEdit.FixedPixelWidth)
+        if width is None:
+            width = self.width()
+        self.setLineWrapColumnOrWidth(width)
+
     def confirmURL(self, link):
         if link.scheme() == "mailto":
             QtGui.QApplication.activeWindow().ui.lineEditTo.setText(link.path())