diff --git a/src/js/email/email.js b/src/js/email/email.js
index 4498c9c..870dcaa 100644
--- a/src/js/email/email.js
+++ b/src/js/email/email.js
@@ -192,11 +192,11 @@ Email.prototype.openFolder = function(options) {
 
         self._imapClient.selectMailbox({
             path: options.folder.path
-        }, function(err) {
+        }, function(err, folder) {
             if (err) {
                 reject(err);
             } else {
-                resolve();
+                resolve(folder);
             }
         });
     });
diff --git a/test/integration/email-dao-test.js b/test/integration/email-dao-test.js
index 9e6b8a3..c4ca728 100644
--- a/test/integration/email-dao-test.js
+++ b/test/integration/email-dao-test.js
@@ -247,35 +247,28 @@ describe('Email DAO integration tests', function() {
                             ca: 'random string'
                         }
                     }, accountService._pgpbuilder)
-                }, cb);
+                }).then(cb).catch(cb);
             });
 
             // clear the local database before each test
             var cleanup = new DeviceStorageDAO(new LawnchairDAO());
-            cleanup.init(testAccount.user, function() {
-                cleanup.clear(function(err) {
-                    expect(err).to.not.exist;
-
-                    onCleaned();
-                });
+            cleanup.init(testAccount.user).then(function() {
+                cleanup.clear().then(onCleaned);
             });
 
             function onCleaned() {
                 userStorage = accountService._accountStore;
                 auth = accountService._auth;
 
-                auth.init(function(err) {
-                    expect(err).to.not.exist;
+                auth.init().then(function() {
                     accountService.init({
                         emailAddress: testAccount.user
-                    }, function(err) {
-                        expect(err).to.not.exist;
-
+                    }).then(function() {
                         emailDao = accountService._emailDao;
 
                         // stub rest request to key server
-                        sinon.stub(emailDao._keychain._publicKeyDao, 'get').yields(null, mockKeyPair.publicKey);
-                        sinon.stub(emailDao._keychain._publicKeyDao, 'getByUserId').yields(null, mockKeyPair.publicKey);
+                        sinon.stub(emailDao._keychain._publicKeyDao, 'get').returns(resolves(mockKeyPair.publicKey));
+                        sinon.stub(emailDao._keychain._publicKeyDao, 'getByUserId').returns(resolves(mockKeyPair.publicKey));
 
                         emailDao.onIncomingMessage = function(messages) {
                             expect(messages.length).to.equal(imapMessages.length);
@@ -303,9 +296,7 @@ describe('Email DAO integration tests', function() {
                         emailDao.unlock({
                             passphrase: testAccount.pass,
                             keypair: mockKeyPair
-                        }, function(err) {
-                            expect(err).to.not.exist;
-
+                        }).then(function() {
                             accountService.onConnect(function(err) {
                                 expect(err).to.not.exist;
                             });
@@ -323,7 +314,7 @@ describe('Email DAO integration tests', function() {
 
         imapClient.stopListeningForChanges(function() {
             imapClient.logout(function() {
-                userStorage.clear(done);
+                userStorage.clear().then(done);
             });
         });
     });
@@ -333,10 +324,7 @@ describe('Email DAO integration tests', function() {
             if (emailDao._imapClient._client.selectedMailbox !== inbox.path) {
                 emailDao.openFolder({
                     folder: inbox
-                }, function(err) {
-                    expect(err).to.not.exist;
-                    done();
-                });
+                }).then(done);
                 return;
             }
 
@@ -360,14 +348,12 @@ describe('Email DAO integration tests', function() {
                 emailDao.deleteMessage({
                     folder: inbox,
                     message: inbox.messages[0]
-                }, function(err) {
-                    expect(err).to.not.exist;
+                }).then(function() {
                     emailDao.openFolder({
                         folder: {
                             path: '[Gmail]/Trash'
                         }
-                    }, function(err, folder) {
-                        expect(err).to.not.exist;
+                    }).then(function(folder) {
                         expect(folder.exists).to.equal(1);
                         done();
                     });
@@ -379,14 +365,12 @@ describe('Email DAO integration tests', function() {
                     folder: inbox,
                     destination: spam,
                     message: inbox.messages[0]
-                }, function(err) {
-                    expect(err).to.not.exist;
+                }).then(function() {
                     emailDao.openFolder({
                         folder: {
                             path: '[Gmail]/Spam'
                         }
-                    }, function(err, folder) {
-                        expect(err).to.not.exist;
+                    }).then(function(folder) {
                         expect(folder.exists).to.equal(1);
                         done();
                     });
@@ -397,8 +381,7 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[2]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     expect(message.body).to.equal('World 5!');
                     done();
                 });
@@ -408,8 +391,7 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[3]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     expect(message.html).to.equal('<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">asd<img apple-inline="yes" id="53B73BDD-69A0-4E8E-BA7B-3D2EF399C0D3" height="1" width="1" apple-width="yes" apple-height="yes" src="data:application/octet-stream;base64,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"></body></html>');
                     done();
                 });
@@ -424,8 +406,7 @@ describe('Email DAO integration tests', function() {
                 emailDao.setFlags({
                     folder: inbox,
                     message: message
-                }, function(err) {
-                    expect(err).to.not.exist;
+                }).then(function() {
                     done();
                 });
             });
@@ -436,13 +417,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[4]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -457,13 +436,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[5]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -478,13 +455,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[6]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -499,13 +474,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[7]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -520,13 +493,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[8]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.false;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -541,13 +512,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[9]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.false;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -562,13 +531,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[10]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -583,13 +550,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[11]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -604,13 +569,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[12]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -625,13 +588,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[13]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -646,13 +607,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[14]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.false;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -667,13 +626,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[15]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.false;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -688,13 +645,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[16]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.false;
                         expect(message.signed).to.be.true;
                         expect(message.signaturesValid).to.be.true;
@@ -709,13 +664,11 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: inbox.messages[17]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     emailDao.decryptBody({
                         message: message,
                         folder: inbox
-                    }, function(err) {
-                        expect(err).to.not.exist;
+                    }).then(function() {
                         expect(message.encrypted).to.be.true;
                         expect(message.signed).to.be.false;
                         expect(message.signaturesValid).to.be.undefined;
@@ -748,8 +701,7 @@ describe('Email DAO integration tests', function() {
                     subject: 'plaintext test',
                     body: 'hello world!'
                 }
-            }, function(err) {
-                expect(err).to.not.exist;
+            }).then(function() {
                 expect(smtpServer.onmail.callCount).to.equal(1);
                 done();
             });
@@ -774,8 +726,7 @@ describe('Email DAO integration tests', function() {
                     body: 'hello world!',
                     publicKeysArmored: [mockKeyPair.publicKey.publicKey]
                 }
-            }, function(err) {
-                expect(err).to.not.exist;
+            }).then(function() {
                 expect(smtpServer.onmail.callCount).to.equal(1);
                 done();
             });
@@ -802,8 +753,7 @@ describe('Email DAO integration tests', function() {
                 emailDao.getBody({
                     folder: inbox,
                     message: messages[0]
-                }, function(err, message) {
-                    expect(err).to.not.exist;
+                }).then(function(message) {
                     expect(message.encrypted).to.be.false;
                     expect(message.signed).to.be.true;
                     expect(message.signaturesValid).to.be.true;
@@ -821,9 +771,7 @@ describe('Email DAO integration tests', function() {
                     subject: 'plaintext test',
                     body: expectedBody
                 }
-            }, function(err) {
-                expect(err).to.not.exist;
-            });
+            }).then(function() {});
         });
     });
 });
\ No newline at end of file