diff --git a/src/index.js b/src/index.js
index 0f35289..1ec980e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,8 +44,13 @@ class StatusJS {
 
   async connect(url) {
     let web3 = new Web3();
-    web3.setProvider(new Web3.providers.WebsocketProvider(url, {headers: {Origin: "statusjs"}}));
-
+    if(url.startsWith("ws://")){
+      web3.setProvider(new Web3.providers.WebsocketProvider(url, {headers: {Origin: "statusjs"}}));
+    } else {
+      const net = require('net');
+      web3.setProvider(new Web3.providers.IpcProvider(url, net));
+    }
+    
     this.shh = web3.shh;
     this.mailservers = new mailservers(web3);
     
@@ -112,7 +117,8 @@ class StatusJS {
     this.channels[channelName].subscription = this.shh.subscribe("messages", {
       minPow: POW_TARGET,
       symKeyID: this.channels[channelName].channelKey,
-      topics: [this.channels[channelName].channelCode]
+      topics: [this.channels[channelName].channelCode],
+      allowP2P: true
     }).on('data', (data) => {
       let username = utils.generateUsernameFromSeed(data.sig);
 
@@ -132,7 +138,8 @@ class StatusJS {
     this.userMessagesSubscription = this.shh.subscribe("messages", {
       minPow: POW_TARGET,
       privateKeyID: this.sig,
-      topics: [CONTACT_DISCOVERY_TOPIC]
+      topics: [CONTACT_DISCOVERY_TOPIC],
+      allowP2P: true
     }).on('data', (data) => {
       if(!this.contacts[data.sig]){
         this.addContact(data.sig);
diff --git a/src/mailservers.js b/src/mailservers.js
index 7f4f4db..bbff637 100644
--- a/src/mailservers.js
+++ b/src/mailservers.js
@@ -6,77 +6,82 @@ class MailServers {
         this.mailserver = null;
     }
 
-    useMailserver(mailserver, cb){
-        if(!mailserverList[mailserver]){
+    async useMailserver(mailserver, cb){
+        var enode = mailserverList[mailserver];
+
+        if(!enode){
             if(!cb) return;
             cb("unknown mailserver: " + mailserver);
         }
 
+        this.symKeyID = await this.web3.shh.generateSymKeyFromPassword("status-offline-inbox");
+
         this.web3.currentProvider.send({
             method: "admin_addPeer",
-            params: [mailserverList[mailserver]],
+            params: [enode],
             jsonrpc: "2.0",
             id: new Date().getTime()
-          }, (err, res) => {
+        }, (err, res) => {
             if(err){
-                if(cb) return cb(err);
+                if(cb) return cb(err, false);
                 return;
             }
 
             if(!res.result){
-                if(cb) return cb(err);
+                if(cb) return cb(err, false);
                 return;
             }
 
-            const peerId = mailserverList[mailserver].substr(8, 128);
-            
-            this.web3.shh.markTrustedPeer(peerId)
-            .then(() => {
-                this.mailserver = peerId;
-                if (!cb) return;
-                cb(null, true);
-            }).catch((e) => {
-                if (!cb) return;
-                cb(e, false);
-            });
-          }
-        );
+            this.web3.shh.markTrustedPeer(enode)
+                .then(res => {
+                    this.mailserver = enode;
+                    if (!cb) return true;
+                    cb(null, true);
+                }).catch((e) => {
+                    console.log(e);
+                    if (!cb) return;
+                    cb(e, false);
+                });
+        });
     }
 
-    async requestMessages(cb){
+    async requestMessages(topic, options, cb){
         if(!this.mailserver){
             if(!cb) return;
-            return cb("Mailserver is not set");
+            return cb("Mailserver is not set", false);
         }
 
-        const symKeyID = await this.web3.shh.generateSymKeyFromPassword("status-offline-inbox");
-
-        // TODO: extract this as parameters
-        const topic =  await this.web3.shh.generateSymKeyFromPassword("mytest");
-        const from = (new Date("2018-11-13 00:00:00")).getTime();
-        const to = (new Date("2018-11-14 20:00:00")).getTime();
+        const topics =   [this.web3.utils.sha3(topic).slice(0, 10)];
+        const mailserverPeer = this.mailserver;
+        const timeout = options.timeout || 30; // seconds
+        const symKeyID = this.symKeyID;
+        const from = options.from || 0; // unix timestamp
+        const to = options.to || 0;
+        const limit = options.limit || 0;
 
         this.web3.currentProvider.send({
-            method: "shh_requestMessages",
-            params: [mailserverList[this.mailserver], topic, symKeyID, from, to ],
+            method: "shhext_requestMessages",
+            params: [{
+                mailserverPeer, 
+                symKeyID,
+                timeout,
+                topics,
+                from,
+                to,
+                limit
+            }],
             jsonrpc: "2.0",
             id: new Date().getTime()
-          }, (err, res) => {
-
-            // TODO: implement result handling
-
+        }, (err, res) => {
             if(err){
-                console.log(err);
+                if(cb) return cb(err);
+                return false;
             }
 
-            console.log(res);
+            if(cb) return cb(null, true);
+            return true;
         });
-
-       
-
     }
-
-
 }
 
 module.exports = MailServers;
diff --git a/test-mailserver.js b/test-mailserver.js
index 1faa418..bf67736 100644
--- a/test-mailserver.js
+++ b/test-mailserver.js
@@ -2,14 +2,19 @@ var StatusJS = require('./src/index.js');
 
 (async () => {
 var status = new StatusJS();
-  await status.connect("ws://localhost:8546");
+  await status.connect("/home/richard/.statusd/geth.ipc");
 
-  status.mailservers.useMailserver("mail-02.gc-us-central1-a.eth.beta",  (err, res) => {
-    
-
-    status.mailservers.requestMessages();
+  const channel = "mytest";
 
+  await status.joinChat(channel);
 
+  status.onMessage(channel, (err, data) => {
+    console.dir(data.payload);
   });
 
+  status.mailservers.useMailserver("mail-02.gc-us-central1-a.eth.beta", (err, res) => {
+    status.mailservers.requestMessages(channel, {}, (err, res) => { if(err) console.log(err); });
+  });
+
+  setInterval(() => { }, 3000);
 })()