diff --git a/app/ux/WebView.js b/app/ux/WebView.js
index e681b331..6103f610 100644
--- a/app/ux/WebView.js
+++ b/app/ux/WebView.js
@@ -36,12 +36,12 @@ Ext.define('Rambox.ux.WebView',{
 		Ext.apply(me, {
 			 items: me.webViewConstructor()
 			,title: me.record.get('name')
- 			,icon: me.record.get('type') === 'custom' ? (me.record.get('logo') === '' ? 'resources/icons/custom.png' : me.record.get('logo')) : 'resources/icons/'+me.record.get('logo')
- 			,src: me.record.get('url')
- 			,type: me.record.get('type')
- 			,align: me.record.get('align')
- 			,notifications: me.record.get('notifications')
- 			,muted: me.record.get('muted')
+			,icon: me.record.get('type') === 'custom' ? (me.record.get('logo') === '' ? 'resources/icons/custom.png' : me.record.get('logo')) : 'resources/icons/'+me.record.get('logo')
+			,src: me.record.get('url')
+			,type: me.record.get('type')
+			,align: me.record.get('align')
+			,notifications: me.record.get('notifications')
+			,muted: me.record.get('muted')
 			,tabConfig: {
 				listeners: {
 					 badgetextchange: me.onBadgeTextChange
@@ -308,6 +308,10 @@ Ext.define('Rambox.ux.WebView',{
 		webview.addEventListener('did-get-redirect-request', function( e ) {
 			if ( e.isMainFrame ) webview.loadURL(e.newURL);
 		});
+
+		var webFrame = require('electron').webFrame;
+		var SpellCheckProvider = require('electron-spell-check-provider');
+		webFrame.setSpellCheckProvider('en-US', true, new SpellCheckProvider('en-US'));
 	}
 
 	,reloadService: function(btn) {
diff --git a/package.json b/package.json
index 600fb175..f5c8ef7a 100644
--- a/package.json
+++ b/package.json
@@ -1,105 +1,106 @@
 {
-	"private": true,
-	"scripts": {
-		"start": "electron electron/main.js",
-		"start:debug": "electron electron/main.js --enable-logging",
-		"test": "node electron/test.js",
-		"sencha:clean": "rm -rf ./build/production",
-		"sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/",
-		"sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build",
-		"clean": "rm -rf ./dist",
-		"clean:osx": "rm -rf ./dist/Rambox-darwin-*",
-		"clean:win": "rm -rf ./dist/Rambox-win32-*",
-		"pack": "npm run pack:osx && npm run pack:win",
-		"pack:osx": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=darwin --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:win": "npm run pack:win32 && npm run pack:win64",
-		"pack:win32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=32-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:win64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:linux": "npm run pack:linux32 && npm run pack:linux64",
-		"pack:linux32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
-		"build": "npm run build:linux && npm run build:osx && npm run build:win",
-		"build:osx": "build --osx",
-		"build:linux": "npm run build:linux32 && npm run build:linux64",
-		"build:linux32": "build --linux --ia32",
-		"build:linux64": "build --linux --x64",
-		"build:win32": "build --win --ia32",
-		"build:win64": "build --win --x64",
-		"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
-		"setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win",
-		"all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
-		"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux"
-	},
-	"build": {
-		"productName": "Rambox",
-		"appId": "com.saenzramiro.rambox",
-		"category": "public.app-category.productivity",
-		"asar": true,
-		"mac": {
-			"target": [
-				"default"
-			],
-			"icon": "./resources/installer/Icon.icns"
-		},
-		"dmg": {
-			"title": "Rambox",
-			"icon": "./resources/installer/Icon.icns",
-			"icon-size": 128,
-			"contents": [
-				{
-					"x": 355,
-					"y": 125,
-					"type": "link",
-					"path": "/Applications"
-				},
-				{
-					"x": 155,
-					"y": 125,
-					"type": "file"
-				}
-			]
-		},
-		"win": {
-			"title": "Rambox",
-
-			"target": [
-				"squirrel",
-				"zip"
-			],
-			"loadingGif": "./resources/installer/loading.gif",
-			"iconUrl": "https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/Icon.ico",
-			"icon": "./resources/Icon.ico",
-			"msi": false
-		},
-		"linux": {
-			"target": [
-				"AppImage",
-				"deb",
-				"rpm",
-				"zip",
-				"tar.gz"
-			],
-			"icon": "./resources/Icon.png"
-		}
-	},
-	"directories": {
-		"buildResources": "resources/installer/",
-		"output": "dist/",
-		"app": "build/production/Rambox/"
-	},
-	"devDependencies": {
-		"asar": "^0.12.1",
-		"electron-builder": "6.5.2",
-		"electron": "1.4.7",
-		"electron-squirrel-startup": "^1.0.0"
-	},
-	"dependencies": {
-		"auto-launch": "4.0.0",
-		"firebase": "^3.0.5",
-		"firebase-token-generator": "^2.0.0",
-		"tmp": "0.0.28",
-		"mime": "^1.3.4",
-		"electron-is-dev": "^0.1.1",
-		"electron-config": "0.2.1"
-	}
+  "private": true,
+  "scripts": {
+    "start": "electron electron/main.js",
+    "start:debug": "electron electron/main.js --enable-logging",
+    "test": "node electron/test.js",
+    "sencha:clean": "rm -rf ./build/production",
+    "sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/",
+    "sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build",
+    "clean": "rm -rf ./dist",
+    "clean:osx": "rm -rf ./dist/Rambox-darwin-*",
+    "clean:win": "rm -rf ./dist/Rambox-win32-*",
+    "pack": "npm run pack:osx && npm run pack:win",
+    "pack:osx": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=darwin --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+    "pack:win": "npm run pack:win32 && npm run pack:win64",
+    "pack:win32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=32-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+    "pack:win64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+    "pack:linux": "npm run pack:linux32 && npm run pack:linux64",
+    "pack:linux32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+    "pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite",
+    "build": "npm run build:linux && npm run build:osx && npm run build:win",
+    "build:osx": "build --osx",
+    "build:linux": "npm run build:linux32 && npm run build:linux64",
+    "build:linux32": "build --linux --ia32",
+    "build:linux64": "build --linux --x64",
+    "build:win32": "build --win --ia32",
+    "build:win64": "build --win --x64",
+    "setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
+    "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win",
+    "all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
+    "all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux"
+  },
+  "build": {
+    "productName": "Rambox",
+    "appId": "com.saenzramiro.rambox",
+    "category": "public.app-category.productivity",
+    "asar": true,
+    "mac": {
+      "target": [
+        "default"
+      ],
+      "icon": "./resources/installer/Icon.icns"
+    },
+    "dmg": {
+      "title": "Rambox",
+      "icon": "./resources/installer/Icon.icns",
+      "icon-size": 128,
+      "contents": [
+        {
+          "x": 355,
+          "y": 125,
+          "type": "link",
+          "path": "/Applications"
+        },
+        {
+          "x": 155,
+          "y": 125,
+          "type": "file"
+        }
+      ]
+    },
+    "win": {
+      "title": "Rambox",
+      "target": [
+        "squirrel",
+        "zip"
+      ],
+      "loadingGif": "./resources/installer/loading.gif",
+      "iconUrl": "https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/Icon.ico",
+      "icon": "./resources/Icon.ico",
+      "msi": false
+    },
+    "linux": {
+      "target": [
+        "AppImage",
+        "deb",
+        "rpm",
+        "zip",
+        "tar.gz"
+      ],
+      "icon": "./resources/Icon.png"
+    }
+  },
+  "directories": {
+    "buildResources": "resources/installer/",
+    "output": "dist/",
+    "app": "build/production/Rambox/"
+  },
+  "devDependencies": {
+    "asar": "^0.12.1",
+    "electron": "1.4.7",
+    "electron-builder": "6.5.2",
+    "electron-rebuild": "^1.5.5",
+    "electron-squirrel-startup": "^1.0.0"
+  },
+  "dependencies": {
+    "auto-launch": "4.0.0",
+    "electron-config": "0.2.1",
+    "electron-is-dev": "^0.1.1",
+    "electron-spell-check-provider": "^1.0.0",
+    "firebase": "^3.0.5",
+    "firebase-token-generator": "^2.0.0",
+    "mime": "^1.3.4",
+    "tmp": "0.0.28"
+  }
 }