diff --git a/libresapi/src/api/ApiServer.cpp b/libresapi/src/api/ApiServer.cpp
index b9606a003..593e9386a 100644
--- a/libresapi/src/api/ApiServer.cpp
+++ b/libresapi/src/api/ApiServer.cpp
@@ -17,6 +17,8 @@
 #include "ChannelsHandler.h"
 #include "StatsHandler.h"
 
+#include "SettingsHandler.h"
+
 /*
 data types in json       http://json.org/
 string (utf-8 unicode)
@@ -236,7 +238,8 @@ public:
         mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler),
         mApiPluginHandler(sts, ifaces),
 	    mChannelsHandler(ifaces.mGxsChannels),
-	    mStatsHandler()
+	    mStatsHandler(),
+	    mSettingsHandler(sts)
     {
         // the dynamic cast is to not confuse the addResourceHandler template like this:
         // addResourceHandler(derived class, parent class)
@@ -262,7 +265,9 @@ public:
                                   &ChannelsHandler::handleRequest);
 		router.addResourceHandler("stats", dynamic_cast<ResourceRouter*>(&mStatsHandler),
 		                          &StatsHandler::handleRequest);
-    }
+		router.addResourceHandler("settings", dynamic_cast<ResourceRouter*>(&mSettingsHandler),
+		                                  &SettingsHandler::handleRequest);
+	}
 
     PeersHandler mPeersHandler;
     IdentityHandler mIdentityHandler;
@@ -274,6 +279,7 @@ public:
     ApiPluginHandler mApiPluginHandler;
     ChannelsHandler mChannelsHandler;
 	StatsHandler mStatsHandler;
+	SettingsHandler mSettingsHandler;
 };
 
 ApiServer::ApiServer():
diff --git a/libresapi/src/api/SettingsHandler.cpp b/libresapi/src/api/SettingsHandler.cpp
new file mode 100644
index 000000000..6e1aa75da
--- /dev/null
+++ b/libresapi/src/api/SettingsHandler.cpp
@@ -0,0 +1,182 @@
+#include "SettingsHandler.h"
+
+#include <iostream>
+
+#include <retroshare/rsinit.h>
+
+namespace resource_api
+{
+    #define SETTINGS_FILE   (QString::fromUtf8(RsAccounts::AccountDirectory().c_str()) + "/Sonet.conf")
+
+    SettingsHandler::SettingsHandler(StateTokenServer *sts, const QString settingsGroup) :
+        QSettings(SETTINGS_FILE, QSettings::IniFormat),
+        mStateTokenServer(sts),
+        mMtx("SettingsHandler Mutex"),
+        mStateToken(sts->getNewToken())
+    {
+        RsPeerId sPreferedId;
+        m_bValid = RsAccounts::GetPreferredAccountId(sPreferedId);
+
+        if (!settingsGroup.isEmpty())
+            beginGroup(settingsGroup);
+
+        addResourceHandler("*", this, &SettingsHandler::handleSettingsRequest);
+        addResourceHandler("get_advanced_mode", this, &SettingsHandler::handleGetAdvancedMode);
+        addResourceHandler("set_advanced_mode", this, &SettingsHandler::handleSetAdvancedMode);
+        addResourceHandler("get_flickable_grid_mode", this, &SettingsHandler::handleGetFlickableGridMode);
+        addResourceHandler("set_flickable_grid_mode", this, &SettingsHandler::handleSetFlickableGridMode);
+        addResourceHandler("get_auto_login", this, &SettingsHandler::handleGetAutoLogin);
+        addResourceHandler("set_auto_login", this, &SettingsHandler::handleSetAutoLogin);
+    }
+
+    SettingsHandler::~SettingsHandler()
+    {
+        sync();
+    }
+
+    void SettingsHandler::handleSettingsRequest(Request &/*req*/, Response &resp)
+    {
+
+    }
+
+    void SettingsHandler::handleGetAdvancedMode(Request &/*req*/, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool advanced_mode = valueFromGroup("General", "Advanced", false).toBool();
+        resp.mDataStream << makeKeyValueReference("advanced_mode", advanced_mode);
+        resp.setOk();
+        sync();
+    }
+
+    void SettingsHandler::handleSetAdvancedMode(Request &req, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool advanced_mode;
+        req.mStream << makeKeyValueReference("advanced_mode", advanced_mode);
+        setValueToGroup("General", "Advanced", advanced_mode);
+        resp.setOk();
+        sync();
+    }
+
+    void SettingsHandler::handleGetFlickableGridMode(Request &/*req*/, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool flickable_grid_mode = valueFromGroup("General", "FlickableGrid", false).toBool();
+        resp.mDataStream << makeKeyValueReference("flickable_grid_mode", flickable_grid_mode);
+        resp.setOk();
+        sync();
+    }
+
+    void SettingsHandler::handleSetFlickableGridMode(Request &req, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool flickable_grid_mode;
+        req.mStream << makeKeyValueReference("flickable_grid_mode", flickable_grid_mode);
+        setValueToGroup("General", "FlickableGrid", flickable_grid_mode);
+
+        resp.setOk();
+        sync();
+    }
+
+    void SettingsHandler::handleGetAutoLogin(Request &/*req*/, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool autoLogin = RsInit::getAutoLogin();;
+        resp.mDataStream << makeKeyValueReference("auto_login", autoLogin);
+        resp.setOk();
+        sync();
+    }
+
+    void SettingsHandler::handleSetAutoLogin(Request &req, Response &resp)
+    {
+        {
+            RS_STACK_MUTEX(mMtx);
+            resp.mStateToken = mStateToken;
+        }
+
+        bool autoLogin;
+        req.mStream << makeKeyValueReference("auto_login", autoLogin);
+        RsInit::setAutoLogin(autoLogin);
+
+        resp.setOk();
+        sync();
+    }
+
+    QVariant SettingsHandler::value(const QString &key, const QVariant &defaultVal) const
+    {
+        if (m_bValid == false)
+        {
+            return defaultVal.isNull() ? defaultValue(key) : defaultVal;
+        }
+        return QSettings::value(key, defaultVal.isNull() ? defaultValue(key) : defaultVal);
+    }
+
+    void SettingsHandler::setValue(const QString &key, const QVariant &val)
+    {
+        if (m_bValid == false)
+        {
+            std::cerr << "RSettings::setValue() Calling on invalid object, key = " << key.toStdString() << std::endl;
+            return;
+        }
+        if (val == defaultValue(key))
+            QSettings::remove(key);
+        else if (val != value(key))
+            QSettings::setValue(key, val);
+    }
+
+    QVariant SettingsHandler::valueFromGroup(const QString &group, const QString &key, const QVariant &defaultVal)
+    {
+        beginGroup(group);
+        QVariant val = value(key, defaultVal);
+        endGroup();
+
+        return val;
+    }
+
+    void SettingsHandler::setValueToGroup(const QString &group, const QString &key, const QVariant &val)
+    {
+        beginGroup(group);
+        setValue(key, val);
+        endGroup();
+    }
+
+    void SettingsHandler::setDefault(const QString &key, const QVariant &val)
+    {
+      _defaults.insert(key, val);
+    }
+
+    QVariant SettingsHandler::defaultValue(const QString &key) const
+    {
+      if (_defaults.contains(key))
+        return _defaults.value(key);
+      return QVariant();
+    }
+
+    void SettingsHandler::reset()
+    {
+      /* Static method, so we have to create a QSettings object. */
+      QSettings settings(SETTINGS_FILE, QSettings::IniFormat);
+      settings.clear();
+    }
+} // namespace resource_api
+
diff --git a/libresapi/src/api/SettingsHandler.h b/libresapi/src/api/SettingsHandler.h
new file mode 100644
index 000000000..b4c21fae2
--- /dev/null
+++ b/libresapi/src/api/SettingsHandler.h
@@ -0,0 +1,59 @@
+#ifndef SETTINGSHANDLER_H
+#define SETTINGSHANDLER_H
+
+#include <QSettings>
+
+#include <util/rsthreads.h>
+
+#include "ResourceRouter.h"
+#include "StateTokenServer.h"
+
+/* Reimplemented class RSettings*/
+namespace resource_api
+{
+    class SettingsHandler : public ResourceRouter, public QSettings
+    {
+    public:
+        SettingsHandler(StateTokenServer* sts, const QString group = QString());
+        ~SettingsHandler();
+
+        static void reset();
+
+        QVariant value(const QString &key,
+                               const QVariant &defaultVal = QVariant()) const;
+
+        void setValue(const QString &key, const QVariant &val);
+
+        QVariant valueFromGroup(const QString &group, const QString &key,
+                               const QVariant &defaultVal = QVariant());
+        void setValueToGroup(const QString &group, const QString &key,
+                                     const QVariant &val);
+
+    protected:
+        void setDefault(const QString &key, const QVariant &val);
+        QVariant defaultValue(const QString &key) const;
+
+        bool m_bValid;
+
+    private:
+        void handleSettingsRequest(Request& req, Response& resp);
+
+        void handleGetAdvancedMode(Request& req, Response& resp);
+        void handleSetAdvancedMode(Request& req, Response& resp);
+
+        void handleGetFlickableGridMode(Request& req, Response& resp);
+        void handleSetFlickableGridMode(Request& req, Response& resp);
+
+        void handleGetAutoLogin(Request& req, Response& resp);
+        void handleSetAutoLogin(Request& req, Response& resp);
+
+        QHash<QString, QVariant> _defaults;
+
+        StateTokenServer* mStateTokenServer;
+
+        RsMutex mMtx;
+        StateToken mStateToken; // mutex protected
+    };
+} // namespace resource_api
+
+#endif // SETTINGSHANDLER_H
diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro
index f1a3aa8d5..31de982b3 100644
--- a/libresapi/src/libresapi.pro
+++ b/libresapi/src/libresapi.pro
@@ -182,7 +182,8 @@ SOURCES += \
     util/ContentTypes.cpp \
     api/ApiPluginHandler.cpp \
     api/ChannelsHandler.cpp \
-    api/StatsHandler.cpp
+    api/StatsHandler.cpp \
+    api/SettingsHandler.cpp
 
 HEADERS += \
 	api/ApiServer.h \
@@ -209,7 +210,8 @@ HEADERS += \
     util/ContentTypes.h \
     api/ApiPluginHandler.h \
     api/ChannelsHandler.h \
-    api/StatsHandler.h
+    api/StatsHandler.h \
+    api/SettingsHandler.h
 
 libresapilocalserver {
     CONFIG *= qt