Merge remote-tracking branch 'refs/remotes/origin/master' into 0.5.11

# Conflicts:
#	electron/main.js

app/view/preferences/Preferences.js

@@ -169,6 +169,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,value: config.systemtray_indicator
 						,hidden: process.platform === 'darwin'
 					}
+					,{
+						 xtype: 'checkbox'
+						,name: 'flash_frame'
+						,boxLabel: locale['preferences[9]']
+						,value: config.flash_frame
+					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'disable_gpu'

electron/main.js

@@ -22,6 +22,7 @@ const config = new Config({
 		,hide_menu_bar: false
 		,window_display_behavior: 'taskbar_tray'
 		,auto_launch: !isDev
+		,flash_frame: true
 		,window_close_behavior: 'keep_in_tray'
 		,start_minimized: false
 		,systemtray_indicator: true
@@ -276,7 +277,7 @@ function updateBadge(title) {
 		app.setBadgeCount(messageCount);
 	}
 
-	if ( messageCount > 0 && !mainWindow.isFocused() && !config.get('dont_disturb') ) mainWindow.flashFrame(true);
+	if ( messageCount > 0 && !mainWindow.isFocused() && !config.get('dont_disturb') && config.get('flash_frame') ) mainWindow.flashFrame(true);
 }
 
 ipcMain.on('setBadge', function(event, messageCount, value) {