diff --git a/packages/local-sync/src/models/message.js b/packages/local-sync/src/models/message.js
index c4286f3ba..e90fd113e 100644
--- a/packages/local-sync/src/models/message.js
+++ b/packages/local-sync/src/models/message.js
@@ -217,6 +217,7 @@ module.exports = (sequelize, Sequelize) => {
           labels: this.labels ? this.labels.map(l => l.toJSON()) : [],
           imap_uid: this.folderImapUID,
           thread_id: this.threadId,
+          message_id_header: this.headerMessageId,
         };
       },
     },
diff --git a/pm2-dev.yml b/pm2-dev.yml
index 1975da95d..43c88302e 100644
--- a/pm2-dev.yml
+++ b/pm2-dev.yml
@@ -19,8 +19,9 @@ apps:
     watch    : ["packages"]
     name     : workers
     env      :
+      DB_NAME : "nylasmailclouddb"
       DB_ENCRYPTION_ALGORITHM : "aes-256-ctr"
       DB_ENCRYPTION_PASSWORD : "d6F3Efeq"
       NODE_ENV: 'development'
-  - script : redis-server
-    name   : redis
+  - script   : scripts/run-redis.sh
+    name     : redis
diff --git a/scripts/run-redis.sh b/scripts/run-redis.sh
new file mode 100755
index 000000000..ddac71cd1
--- /dev/null
+++ b/scripts/run-redis.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Redis is one of those servers which by default
+# accept connections from everywhere. Luckily,
+# homebrew and presumably debian come with sane
+# defaults. However, they're located in different
+# directories.
+if [[ $(uname) = 'Darwin' ]]; then
+    echo "Running redis from Homebrew..."
+    redis-server /usr/local/etc/redis.conf
+fi
+
+if [[ $(uname) = 'Linux' ]]; then
+    echo "Running redis"
+    redis-server /etc/redis/redis.conf
+fi