diff --git a/app/src/error-logger-extensions/raven-error-reporter.js b/app/src/error-logger-extensions/raven-error-reporter.js
index b16c756e2..9d16db0d5 100644
--- a/app/src/error-logger-extensions/raven-error-reporter.js
+++ b/app/src/error-logger-extensions/raven-error-reporter.js
@@ -29,9 +29,7 @@ module.exports = class RavenErrorReporter {
   }
 
   getVersion() {
-    return process.type === 'renderer'
-      ? AppEnv.getVersion()
-      : require('electron').app.getVersion();
+    return process.type === 'renderer' ? AppEnv.getVersion() : require('electron').app.getVersion();
   }
 
   reportError(err, extra) {
diff --git a/app/src/flux/mailsync-bridge.es6 b/app/src/flux/mailsync-bridge.es6
index 0312b7ee5..59ef3d0b3 100644
--- a/app/src/flux/mailsync-bridge.es6
+++ b/app/src/flux/mailsync-bridge.es6
@@ -51,11 +51,16 @@ class CrashTracker {
       const lines = message
         .split('\n')
         .map(l => l.replace(/\*\*\*/g, '').trim())
-        .filter(l => !l.startsWith('[') && !l.startsWith('Error: null['));
+        .filter(l => !/^[\d|[ ]+/.test(l) && !l.startsWith('Error: null'));
       message = `${overview}:\n${lines.join('\n')}`;
     }
     if (stack) {
-      const lines = stack.split('\n').map(l => l.replace(/\*\*\*/g, '').trim());
+      const lines = stack.split('\n').map(l =>
+        l
+          .replace(/\*\*\*/g, '')
+          .replace('in mailsync ', '')
+          .trim()
+      );
       lines.shift();
       message = `${message}${lines[0]}`;
       stack = lines.join('\n');