diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 53b019820..e34e1c789 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -526,7 +526,6 @@
 		var
 			bNew = false,
 			bIsHtml = false,
-			sTag = 'div',
 			bHasExternals = false,
 			bHasInternals = false,
 			oBody = null,
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index a1440fee4..a101a533f 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -380,19 +380,24 @@ html.rl-no-preview-pane {
 							// margin: 15px;
 						}
 
-						pre {
+						pre, code {
 							margin: 0px;
 							padding: 0px;
 							background: #fff;
 							border: none;
+							border-radius: 0;
 							font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
+							display: block;
+							max-width: 700px;
+							white-space: pre;
+							word-wrap: break-word;
 						}
 					}
 
 					&.plain {
 
 						padding: 15px;
-						white-space: pre-wrap;
+						/*white-space: pre-wrap;*/
 						font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
 
 						pre {
@@ -401,6 +406,8 @@ html.rl-no-preview-pane {
 							background: #fff;
 							border: none;
 							font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
+							display: block;
+							white-space: pre;
 						}
 
 						pre.b-plain-openpgp {
diff --git a/package.json b/package.json
index 918f2d74e..b67041bde 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "RainLoop",
   "title": "RainLoop Webmail",
   "version": "1.9.2",
-  "release": "343",
+  "release": "351",
   "description": "Simple, modern & fast web-based email client",
   "homepage": "http://rainloop.net",
   "main": "gulpfile.js",
@@ -40,7 +40,7 @@
     "plugins"
   ],
   "readmeFilename": "README.md",
-  "ownCloudPackageVersion": "4.4",
+  "ownCloudPackageVersion": "4.5",
   "engines": {
     "node": ">= 0.10.0"
   },