diff --git a/index.js b/index.js
index fd431dd..e7e97d7 100644
--- a/index.js
+++ b/index.js
@@ -11,30 +11,6 @@ var logger = require('winston');
 logger.remove(logger.transports.Console);
 logger.add(logger.transports.Console, { timestamp: function() { return (strftime('%F %T'));  }});
 
-var db = require('./db.js');
-db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
-
-
-function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
-
-    db_connection.query(
-        'INSERT INTO messages SET ?',
-        {
-            transport: 'YAHOO',
-            logger: logger_id,
-            direction: direction,
-            partner: partner,
-            message: message,
-            sentdate: sentdate,
-        },
-
-        function(err) {
-            if (err != null) {
-                logger.error("Error on inserting messages to DB, error: " + err);
-            }
-        }
-    );
-}
 
 var ym = require('./ym');
 var YahooMessenger = ym.start(config, logger);
diff --git a/ym.js b/ym.js
index 15432ad..8604c50 100644
--- a/ym.js
+++ b/ym.js
@@ -1,5 +1,27 @@
 var YahooMessenger = require("yahoomessenger");
 var striptags = require('striptags');
+var db = require('./db.js');
+
+function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
+
+    db_connection.query(
+        'INSERT INTO messages SET ?',
+        {
+            transport: 'YAHOO',
+            logger: logger_id,
+            direction: direction,
+            partner: partner,
+            message: message,
+            sentdate: sentdate,
+        },
+
+        function(err) {
+            if (err != null) {
+                logger.error("Error on inserting messages to DB, error: " + err);
+            }
+        }
+    );
+}
 
 function start(config, logger) {
     var oldMessages = [];
@@ -108,7 +130,6 @@ function start(config, logger) {
         var strftime = require('strftime');
         sentdate = strftime('%Y-%m-%d %H:%M:%S', sentdate);
 
-        /*
         insertMessages(
             db_connection,
             data.user_id,
@@ -117,7 +138,6 @@ function start(config, logger) {
             message,
             sentdate
         );
-        */
 
         broadcast(config.yahoomessenger.report_to, '@' + data.sender + ': ' + message, partner);
 
@@ -149,6 +169,9 @@ function start(config, logger) {
         }
     }
 
+    db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
+
+
     YahooMessenger.newInstance();
     YahooMessenger.on('ready', onReady);
     YahooMessenger.on('loginSuccessful', onLoginSuccesful);