diff --git a/lib/node_mailer.js b/lib/node_mailer.js
index 873eb01..5bd62e0 100644
--- a/lib/node_mailer.js
+++ b/lib/node_mailer.js
@@ -27,6 +27,7 @@ var EmailMessage = require("nodemailer").EmailMessage;
 var fs = require('fs');
 var mustache = require('../vendor/mustache');
 var _templateCache = {};
+var deliveries = exports.deliveries = [];
 
 function SMTPClientPool() {
   this.servers = {};
@@ -68,8 +69,16 @@ SMTPClientPool.prototype.send = function send(message, callback) {
      delete hostClients[options.user];
      client.close();})
   }
-  client.sendMail(message,callback);
-  client.on('error', callback);
+  if(message.SERVER.test) {
+    deliveries.push(message);
+    if(message.debug) {
+      console.log("Node mailer added message: " + require('sys').inspect(message));
+    }
+  } 
+  else {
+    client.sendMail(message,callback);
+    client.on('error', callback);    
+  }
 }
 
 function merge(x,y) {
@@ -94,7 +103,8 @@ exports.send = function node_mail(message, callback) {
     ssl: message.ssl,
     user: message.username && message.username.toString(),
     pass: message.password && message.password.toString(),
-    debug: true
+    test: message.test,
+    debug: message.debug
   };
   if(message.username || message.password) {
     pool.addClient(server.port, server.host, server);
diff --git a/package.json b/package.json
index ab9e7fb..6fbc7a1 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "url": "http://github.com/Marak/node_mailer.git"
   },
   "dependencies": {
-    "nodemailer": ">= 0.1.10",
+    "nodemailer": "0.1.x",
     "colors": ">= 0.3.0"
   },
   "engine": [ "node >=0.3.0" ],