diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 6658fc38..b1ffe7e0 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -249,6 +249,8 @@ class Controller(object):
   # Connection checker executed each minute.
   self.checker_function = RepeatingTimer(60, self.check_connection)
   self.checker_function.start()
+  self.save_db = RepeatingTimer(300, self.save_data_in_db)
+  self.save_db.start()
 
  def start(self):
   """ Starts all buffer objects. Loads their items."""
@@ -1494,4 +1496,8 @@ class Controller(object):
   id = data["delete"]["status"]["id"]
   for i in self.buffers:
    if hasattr(i, "remove_tweet") and hasattr(i, "name"):
-    i.remove_tweet(id)
\ No newline at end of file
+    i.remove_tweet(id)
+
+ def save_data_in_db(self):
+  for i in session_.sessions:
+   session_.sessions[i].shelve()
\ No newline at end of file
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index de122cab..24e754ff 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """ The main session object. Here are the twitter functions to interact with the "model" of TWBlue."""
 import urllib2
+import config
 import twitter
 from keys import keyring
 import session_exceptions as Exceptions
@@ -425,7 +426,7 @@ class Session(object):
 
  def check_quoted_status(self, tweet):
   status = tweets.is_long(tweet)
-  if status != False:
+  if status != False and config.app["app-settings"]["handle_longtweets"]:
    tweet = self.get_quoted_tweet(tweet)
   return tweet
 
@@ -447,6 +448,6 @@ class Session(object):
 
  def check_long_tweet(self, tweet):
   long = twishort.is_long(tweet)
-  if long != False:
+  if long != False and config.app["app-settings"]["handle_longtweets"]:
    tweet["message"] = twishort.get_full_text(long)
   return tweet
\ No newline at end of file