diff --git a/src/js/app-config.js b/src/js/app-config.js
index f1b7063..97e2620 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -13,7 +13,7 @@ define([], function() {
 		cloudUrl: 'https://storage.whiteout.io',
 		symKeySize: 128,
 		symIvSize: 128,
-		asymKeySize: 1024,
+		asymKeySize: 2048,
 		workerPath: 'js',
 		gmail: {
 			clientId: '440907777130.apps.googleusercontent.com',
diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index 1a5c3a4..7637a15 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -17,7 +17,10 @@ define(function(require) {
         //
 
         $scope.select = function(email) {
-            if (email && typeof email.body === 'string') {
+            if (!email) {
+                return;
+            }
+            if (typeof email.body === 'string') {
                 email.bodyDisplayParts = email.body.split('\n');
             }
             $scope.selected = email;