diff --git a/build/resources/nylas b/build/resources/nylas
index cd182d38d..e0b08839a 160000
--- a/build/resources/nylas
+++ b/build/resources/nylas
@@ -1 +1 @@
-Subproject commit cd182d38de2611b2056e12433a6b3289e7e83d10
+Subproject commit e0b08839a99a66d24a1b64eea4fff265d2290dd9
diff --git a/internal_packages/events/stylesheets/events.less b/internal_packages/events/stylesheets/events.less
index 8a4dea042..555a8f3fd 100644
--- a/internal_packages/events/stylesheets/events.less
+++ b/internal_packages/events/stylesheets/events.less
@@ -17,6 +17,8 @@
   .event-header {
     border-bottom: 1px solid @border-color-divider;
     padding: 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 
     img {
       margin-right: 20px;
diff --git a/internal_packages/thread-list/stylesheets/thread-list.less b/internal_packages/thread-list/stylesheets/thread-list.less
index dbddc9c9d..d376c60b0 100644
--- a/internal_packages/thread-list/stylesheets/thread-list.less
+++ b/internal_packages/thread-list/stylesheets/thread-list.less
@@ -167,7 +167,7 @@
     display:flex;
     align-items: center;
     overflow: hidden;
-    
+
     .subject {
       font-size:   @font-size-small;
       font-weight: @font-weight-normal;
@@ -412,6 +412,7 @@ body.platform-win32 {
   .thread-info-column {
     flex: 1;
     align-self: center;
+    overflow: hidden;
 
     .participants-wrapper {
       display: flex;
diff --git a/package.json b/package.json
index 007e0b011..aa4d6cc1c 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/nylas/N1/issues"
   },
-  "electronVersion": "0.36.9",
+  "electronVersion": "0.37.5",
   "dependencies": {
     "async": "^0.9",
     "atom-keymap": "^6.1.1",
diff --git a/script/bootstrap b/script/bootstrap
index 410d23415..72d2a6559 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -48,7 +48,7 @@ function makeSqlite3Command() {
 
   // Use our local version of npm (npm 3x) to build sqlite
   var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
-  return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v0.36-"+targetPlatform+"-"+targetArch
+  return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v0.37-"+targetPlatform+"-"+targetArch
 }
 
 function bootstrap() {