Merge lp:~mzanetti/reminders-app/notesdelegate into lp:reminders-app

[Michael Zanetti]

Added a NotesDelegate to roughly reflect design wireframe

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:24
http://91.189.93.70:8080/job/reminders-app-ci/38/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/441
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/38/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/notesdelegate]

25. By Michael Zanetti on 2013-12-13

don't automatically fetch notes content to avoid hitting the rate limit

26. By Michael Zanetti on 2013-12-14

merge prerequisite branch

27. By Michael Zanetti on 2013-12-14

added missing file

Unmerged revisions

=== modified file 'src/app/app.pro'
--- src/app/app.pro	2013-11-22 21:35:34 +0000
+++ src/app/app.pro	2013-12-14 00:07:45 +0000
@@ -10,7 +10,10 @@
     qml/ui/RemindersPage.qml \
     qml/ui/NotesPage.qml \
     qml/ui/AccountSelectorPage.qml \
-    qml/ui/NotePage.qml
+    qml/ui/NotePage.qml \
+    qml/ui/SearchNotesPage.qml \
+    qml/components/ToolbarSpacer.qml \
+    qml/components/NotesDelegate.qml \
 
 # Copy qml to build dir for running with qtcreator
 qmlfolder.source = src/app/qml
 
=== added directory 'src/app/qml/components'
=== added file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/NotesDelegate.qml	2013-12-14 00:07:45 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Empty {
+    id: root
+    height: units.gu(9)
+
+    property string title
+    property date creationDate
+    property string content
+
+    Column {
+        id: contentColumn
+        spacing: units.gu(1)
+        anchors {
+            top: parent.top
+            topMargin: units.gu(1)
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: root.title
+            font.bold: true
+            elide: Text.ElideRight
+        }
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: "<font color=\"#dd4814\">"+ Qt.formatDate(root.creationDate) + "</font>  " + root.content
+            wrapMode: Text.WordWrap
+            textFormat: Text.StyledText
+            maximumLineCount: 2
+        }
+    }
+}
 
=== added file 'src/app/qml/components/ToolbarSpacer.qml'
--- src/app/qml/components/ToolbarSpacer.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/ToolbarSpacer.qml	2013-12-14 00:07:45 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Item {
+    id: spacerItem
+    objectName: "__ToolBarItems.SpacerItem"
+    height: parent.height
+    width: {
+        var othersWidth = 0;
+
+        // Hack: the autogenerated back button
+        if (pageStack != null && pageStack.depth > 1) {
+            othersWidth = units.gu(6)
+        }
+
+        for (var i = 0; i < parent.children.length; ++i) {
+            var otherItem = parent.children[i];
+            if (otherItem.objectName !== "__ToolBarItems.SpacerItem") {
+                if (otherItem.visible) {
+                    othersWidth += otherItem.width + parent.spacing;
+                }
+            }
+        }
+        return parent.parent.width - othersWidth - units.gu(4);
+    }
+}
 
=== modified file 'src/app/qml/reminders-app.qml'
--- src/app/qml/reminders-app.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/reminders-app.qml	2013-12-14 00:07:45 +0000
@@ -47,11 +47,18 @@
 
     Component.onCompleted: {
         pagestack.push(rootTabs)
-        if (NotesStore.token.length === 0) {
+        if (EvernoteConnection.token.length === 0) {
             pagestack.push(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
         }
     }
 
+    Connections {
+        target: UserStore
+        onUsernameChanged: {
+            print("Logged in as user:", UserStore.username)
+        }
+    }
+
     PageStack {
         id: pagestack
 
 
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2013-12-14 00:07:45 +0000
@@ -51,7 +51,7 @@
                         // Print the access token on the console
                         onAuthenticated: {
                             console.log("Access token is " + reply.AccessToken)
-                            NotesStore.token = reply.AccessToken;
+                            EvernoteConnection.token = reply.AccessToken;
                             pagestack.pop();
                         }
                         onAuthenticationError: { console.log("Authentication failed, code " + error.code) }
 
=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotePage.qml	2013-12-14 00:07:45 +0000
@@ -24,6 +24,8 @@
     title: note.title
     property var note
 
+    Component.onCompleted: NotesStore.refreshNoteContent(note.guid)
+
     Column {
         anchors.fill: parent
         spacing: units.gu(1)
 
=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2013-12-14 00:07:45 +0000
@@ -30,6 +30,15 @@
         }
     }
 
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "add notebook"
+            onTriggered: {
+                NotesStore.createNotebook("new notebook");
+            }
+        }
+    }
+
     Notebooks {
         id: notebooks
     }
 
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-12-14 00:07:45 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Evernote 0.1
+import "../components"
 
 Page {
     id: notesPage
@@ -28,14 +29,23 @@
 
     onActiveChanged: {
         if (active) {
-            print("refreshing notes")
-            notes.refresh();
+            NotesStore.refreshNotes();
         }
     }
 
     // Just for testing
     tools: ToolbarItems {
         ToolbarButton {
+            text: "search"
+            iconName: "search"
+            onTriggered: {
+                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
+            }
+        }
+
+        ToolbarSpacer { }
+
+        ToolbarButton {
             text: "add note"
             enabled: notes.filterNotebookGuid.length > 0
             onTriggered: {
@@ -52,18 +62,22 @@
     }
 
     ListView {
-        anchors.fill: parent
+        anchors { left: parent.left; right: parent.right }
+        height: parent.height - y
         model: notes
+        clip: true
 
-        delegate: Standard {
-            text: title
+        delegate: NotesDelegate {
+            title: model.title
+            creationDate: model.created
+            content: NotesStore.note(model.guid).plaintextContent
 
             onClicked: {
-                pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: notes.note(guid)})
+                pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
             }
 
             onPressAndHold: {
-                notes.note(guid).remove();
+                NotesStore.deleteNote(guid);
             }
         }
     }
 
=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/RemindersPage.qml	2013-12-14 00:07:45 +0000
@@ -19,28 +19,27 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
-//import "../components"
+import Evernote 0.1
 
 Page {
     id: remindersPage
 
-    Label {
-        id: developmentWarning
-        anchors.centerIn: parent
-        text: i18n.tr("This page is still in development")
+    Notes {
+        id: notes
+        onlyReminders: true
     }
 
     ListView {
 
-        width: parent.width; height: parent.height
+        anchors.fill: parent
 
         delegate: Subtitled {
-            text: '<b>Name:</b> ' + model.name
-            subText: '<b>Date:</b> ' + model.date
+            text: '<b>Name:</b> ' + model.title
+            subText: '<b>Date:</b> ' + Qt.formatDateTime(model.created) +
+                     (model.reminderDone ? " - <b>Done:</b> " + Qt.formatDate(model.reminderDoneTime) : "")
         }
 
-//        model: RemindersModel {}
-
+        model: notes
     }
 
 }
 
=== added file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2013-12-14 00:07:45 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Evernote 0.1
+import "../components"
+
+Page {
+    Column {
+        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
+        spacing: units.gu(2)
+
+        Row {
+            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
+            spacing: units.gu(1)
+
+            TextField {
+                id: searchField
+                width: parent.width - searchButton.width - parent.spacing
+                anchors.verticalCenter: parent.verticalCenter
+
+                primaryItem: Icon {
+                    height: searchField.height - units.gu(1)
+                    width: height
+                    name: "search"
+                }
+
+                onAccepted: {
+                    NotesStore.findNotes(searchField.text + "*")
+                }
+            }
+            Button {
+                id: searchButton
+                height: searchField.height
+                text: "search"
+                onClicked: {
+                    NotesStore.findNotes(searchField.text + "*")
+                }
+            }
+        }
+
+        ListView {
+            anchors { left: parent.left; right: parent.right }
+            height: parent.height - y
+            clip: true
+
+            model: Notes {
+                onlySearchResults: true
+            }
+
+            delegate: NotesDelegate {
+                title: model.title
+                creationDate: model.created
+                content: NotesStore.note(model.guid).plaintextContent
+
+                onClicked: {
+                    pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
+                }
+            }
+        }
+
+    }
+}
 
=== modified file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-11-27 17:33:36 +0000
+++ src/plugin/Evernote/Evernote.pro	2013-12-14 00:07:45 +0000
@@ -23,7 +23,13 @@
     jobs/evernotejob.cpp \
     jobs/savenotejob.cpp \
     jobs/deletenotejob.cpp \
-    utils/html2enmlconverter.cpp
+    utils/html2enmlconverter.cpp \
+    evernoteconnection.cpp \
+    jobs/userstorejob.cpp \
+    jobs/notesstorejob.cpp \
+    jobs/fetchusernamejob.cpp \
+    jobs/createnotebookjob.cpp \
+    jobs/expungenotebookjob.cpp
 
 HEADERS += evernoteplugin.h \
     notesstore.h \
@@ -39,7 +45,13 @@
     jobs/evernotejob.h \
     jobs/savenotejob.h \
     jobs/deletenotejob.h \
-    utils/html2enmlconverter.h
+    utils/html2enmlconverter.h \
+    evernoteconnection.h \
+    jobs/userstorejob.h \
+    jobs/notesstorejob.h \
+    jobs/fetchusernamejob.h \
+    jobs/createnotebookjob.h \
+    jobs/expungenotebookjob.h
 
 message(building in $$OUT_PWD)
 LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
 
=== added file 'src/plugin/Evernote/evernoteconnection.cpp'
--- src/plugin/Evernote/evernoteconnection.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/evernoteconnection.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,190 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "evernoteconnection.h"
+#include "jobs/evernotejob.h"
+
+// Thrift
+#include <arpa/inet.h> // seems thrift forgot this one
+#include <protocol/TBinaryProtocol.h>
+#include <transport/THttpClient.h>
+#include <transport/TSSLSocket.h>
+#include <Thrift.h>
+
+// Evernote SDK
+#include <NoteStore.h>
+#include <NoteStore_constants.h>
+#include <UserStore.h>
+#include <UserStore_constants.h>
+#include <Errors_types.h>
+
+#include <QDebug>
+
+using namespace apache::thrift;
+using namespace apache::thrift::protocol;
+using namespace apache::thrift::transport;
+
+EvernoteConnection* EvernoteConnection::s_instance = 0;
+
+// FIXME: need to populate this string from the system
+// The structure should be:
+// application/version; platform/version; [ device/version ]
+// E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
+QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
+QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
+QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/user");
+QString EDAM_NOTE_STORE_PATH = QStringLiteral("/edam/note");
+
+EvernoteConnection::EvernoteConnection(QObject *parent) :
+    QObject(parent),
+    m_currentJob(0),
+    m_useSSL(true)
+{
+    setupUserStore();
+    setupNotesStore();
+}
+
+bool EvernoteConnection::setupUserStore()
+{
+    bool versionOK = false;
+    try {
+        boost::shared_ptr<TSocket> socket;
+
+        if (m_useSSL) {
+            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
+            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
+            qDebug() << "created UserStore SSL socket";
+        } else {
+            // Create a non-secure socket
+            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
+            qDebug() << "created insecure UserStore socket";
+        }
+
+        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
+        m_userStoreHttpClient = boost::shared_ptr<THttpClient>(new THttpClient(bufferedTransport,
+                                                                            EVERNOTE_HOST.toStdString(),
+                                                                            EDAM_USER_STORE_PATH.toStdString()));
+        m_userStoreHttpClient->open();
+        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(m_userStoreHttpClient));
+        m_userstoreClient = new evernote::edam::UserStoreClient(iprot);
+        evernote::edam::UserStoreConstants constants;
+        versionOK = m_userstoreClient->checkVersion(EDAM_CLIENT_NAME.toStdString(),
+                                                                      constants.EDAM_VERSION_MAJOR,
+                                                                      constants.EDAM_VERSION_MINOR);
+        qDebug() << "UserStoreClient created. Version check:" << versionOK;
+
+    } catch (const TTransportException & e) {
+        qWarning() << "Failed to create Transport for UserStore:" <<  e.what();
+    } catch (const TException & e) {
+        qWarning() << "Generic Thrift exception in UserStore setup:" << e.what();
+    }
+    return versionOK;
+}
+
+bool EvernoteConnection::setupNotesStore()
+{
+    try {
+        boost::shared_ptr<TSocket> socket;
+
+        if (m_useSSL) {
+            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
+            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
+            qDebug() << "created NotesStore SSL socket";
+        } else {
+            // Create a non-secure socket
+            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
+            qDebug() << "created insecure NotesStore socket";
+        }
+
+        // setup UserStore
+        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
+        m_notesStoreHttpClient = boost::shared_ptr<THttpClient>(new THttpClient(bufferedTransport,
+                                                                            EVERNOTE_HOST.toStdString(),
+                                                                            EDAM_NOTE_STORE_PATH.toStdString()));
+        m_notesStoreHttpClient->open();
+        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(m_notesStoreHttpClient));
+
+        // setup notesstore
+        m_notesStoreClient = new evernote::edam::NoteStoreClient(iprot);
+
+        qDebug() << "NoteStore client created.";
+
+    } catch (const TTransportException & e) {
+        qWarning() << "Failed to create Transport for NotesStore:" <<  e.what();
+        return false;
+    } catch (const TException & e) {
+        qWarning() << "Generic Thrift exception in NotesStore setup:" << e.what();
+        return false;
+    }
+    return true;
+}
+
+EvernoteConnection *EvernoteConnection::instance()
+{
+    if (!s_instance) {
+        s_instance = new EvernoteConnection();
+    }
+    return s_instance;
+}
+
+EvernoteConnection::~EvernoteConnection()
+{
+    delete m_notesStoreClient;
+}
+
+QString EvernoteConnection::token() const
+{
+    return m_token;
+}
+
+void EvernoteConnection::setToken(const QString &token)
+{
+    if (token != m_token) {
+        m_token = token;
+        emit tokenChanged();
+    }
+}
+
+void EvernoteConnection::enqueue(EvernoteJob *job)
+{
+    connect(job, &EvernoteJob::finished, this, &EvernoteConnection::startNextJob);
+
+    m_jobQueue.append(job);
+    startJobQueue();
+}
+
+void EvernoteConnection::startJobQueue()
+{
+    if (m_jobQueue.isEmpty()) {
+        return;
+    }
+
+    if (m_currentJob) {
+        return;
+    }
+    m_currentJob = m_jobQueue.takeFirst();
+    m_currentJob->start();
+}
+
+void EvernoteConnection::startNextJob()
+{
+    m_currentJob = 0;
+    startJobQueue();
+}
 
=== added file 'src/plugin/Evernote/evernoteconnection.h'
--- src/plugin/Evernote/evernoteconnection.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/evernoteconnection.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef EVERNOTECONNECTION_H
+#define EVERNOTECONNECTION_H
+
+#include <boost/shared_ptr.hpp>
+
+// Thrift
+#include <transport/THttpClient.h>
+
+#include <QObject>
+
+namespace evernote {
+namespace edam {
+class NoteStoreClient;
+class UserStoreClient;
+}
+}
+
+using namespace apache::thrift::transport;
+
+class EvernoteJob;
+
+class EvernoteConnection : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
+
+    friend class NotesStoreJob;
+    friend class UserStoreJob;
+
+public:
+    enum ErrorCode {
+        ErrorCodeNoError,
+        ErrorCodeUserException,
+        ErrorCodeSystemException,
+        ErrorCodeNotFoundExcpetion,
+        ErrorCodeConnectionLost
+    };
+
+    static EvernoteConnection* instance();
+    ~EvernoteConnection();
+
+    QString token() const;
+    void setToken(const QString &token);
+
+    void enqueue(EvernoteJob *job);
+
+signals:
+    void tokenChanged();
+
+private slots:
+    void startJobQueue();
+    void startNextJob();
+
+private:
+    explicit EvernoteConnection(QObject *parent = 0);
+    static EvernoteConnection *s_instance;
+
+    bool setupUserStore();
+    bool setupNotesStore();
+
+    bool m_useSSL;
+
+    QString m_token;
+
+    // There must be only one job running at a time
+    // Do not start jobs other than with startJobQueue()
+    QList<EvernoteJob*> m_jobQueue;
+    EvernoteJob *m_currentJob;
+
+    // Those 4 are accessed from the job thread.
+    // Make sure to not access them while any jobs are running
+    // or we need to mutex them.
+    evernote::edam::NoteStoreClient *m_notesStoreClient;
+    boost::shared_ptr<THttpClient> m_notesStoreHttpClient;
+
+    evernote::edam::UserStoreClient *m_userstoreClient;
+    boost::shared_ptr<THttpClient> m_userStoreHttpClient;
+
+};
+
+#endif // EVERNOTECONNECTION_H
 
=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2013-12-14 00:07:45 +0000
@@ -20,6 +20,7 @@
 
 #include "evernoteplugin.h"
 
+#include "evernoteconnection.h"
 #include "userstore.h"
 #include "notesstore.h"
 #include "notes.h"
@@ -28,16 +29,27 @@
 
 #include <QtQml>
 
+static QObject* userStoreProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return UserStore::instance();
+}
+
 static QObject* notesStoreProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
 {
     return NotesStore::instance();
 }
 
+static QObject* connectionProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return EvernoteConnection::instance();
+}
+
 void FitBitPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<UserStore>("Evernote", 0, 1, "UserStore");
-
+    qmlRegisterSingletonType<UserStore>("Evernote", 0, 1, "UserStore", userStoreProvider);
     qmlRegisterSingletonType<NotesStore>("Evernote", 0, 1, "NotesStore", notesStoreProvider);
+    qmlRegisterSingletonType<EvernoteConnection>("Evernote", 0, 1, "EvernoteConnection", connectionProvider);
+
     qmlRegisterType<Notes>("Evernote", 0, 1, "Notes");
     qmlRegisterType<Notebooks>("Evernote", 0, 1, "Notebooks");
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");
 
=== added file 'src/plugin/Evernote/jobs/createnotebookjob.cpp'
--- src/plugin/Evernote/jobs/createnotebookjob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotebookjob.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "createnotebookjob.h"
+
+#include <QDebug>
+
+CreateNotebookJob::CreateNotebookJob(const QString &name, QObject *parent) :
+    NotesStoreJob(parent),
+    m_name(name)
+{
+}
+
+void CreateNotebookJob::startJob()
+{
+    m_result.name = m_name.toStdString();
+    m_result.__isset.name = true;
+    client()->createNotebook(m_result, token().toStdString(), m_result);
+}
+
+void CreateNotebookJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_result);
+}
 
=== added file 'src/plugin/Evernote/jobs/createnotebookjob.h'
--- src/plugin/Evernote/jobs/createnotebookjob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotebookjob.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef CREATENOTEBOOKJOB_H
+#define CREATENOTEBOOKJOB_H
+
+#include "notesstorejob.h"
+
+class CreateNotebookJob : public NotesStoreJob
+{
+    Q_OBJECT
+public:
+    explicit CreateNotebookJob(const QString &name, QObject *parent = 0);
+
+    virtual void startJob() override;
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result);
+
+private slots:
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_name;
+
+    evernote::edam::Notebook m_result;
+};
+
+#endif // CREATENOTEBOOKJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/createnotejob.cpp'
--- src/plugin/Evernote/jobs/createnotejob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/createnotejob.cpp	2013-12-14 00:07:45 +0000
@@ -22,36 +22,30 @@
 
 #include <QDebug>
 
-CreateNoteJob::CreateNoteJob(Note *note, QObject *parent) :
-    EvernoteJob(parent),
-    m_note(note)
-{
-}
-
-void CreateNoteJob::run()
-{
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-
-    try {
-        evernote::edam::Note input;
-        input.title = m_note->title().toStdString();
-        input.__isset.title = true;
-        input.notebookGuid = m_note->notebookGuid().toStdString();
-        input.__isset.notebookGuid = true;
-        input.content = m_note->content().toStdString();
-        input.__isset.content = true;
-        input.contentLength = m_note->content().length();
-        input.__isset.contentLength = true;
-
-        evernote::edam::Note result;
-        client()->createNote(result, token().toStdString(), input);
-
-        m_note->setGuid(QString::fromStdString(result.guid));
-
-    } catch(evernote::edam::EDAMUserException e) {
-        errorCode = NotesStore::ErrorCodeUserException;
-    } catch(evernote::edam::EDAMSystemException) {
-        errorCode = NotesStore::ErrorCodeSystemException;
-    }
-    emit resultReady(errorCode, m_note);
+CreateNoteJob::CreateNoteJob(const QString &title, const QString &notebookGuid, const QString &content, QObject *parent) :
+    NotesStoreJob(parent),
+    m_title(title),
+    m_notebookGuid(notebookGuid),
+    m_content(content)
+{
+}
+
+void CreateNoteJob::startJob()
+{
+    evernote::edam::Note input;
+    input.title = m_title.toStdString();
+    input.__isset.title = true;
+    input.notebookGuid = m_notebookGuid.toStdString();
+    input.__isset.notebookGuid = true;
+    input.content = m_content.toStdString();
+    input.__isset.content = true;
+    input.contentLength = m_content.length();
+    input.__isset.contentLength = true;
+
+    client()->createNote(m_resultNote, token().toStdString(), input);
+}
+
+void CreateNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_resultNote);
 }
 
=== modified file 'src/plugin/Evernote/jobs/createnotejob.h'
--- src/plugin/Evernote/jobs/createnotejob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/createnotejob.h	2013-12-14 00:07:45 +0000
@@ -1,22 +1,27 @@
 #ifndef CREATENOTEJOB_H
 #define CREATENOTEJOB_H
 
-#include "evernotejob.h"
-#include "note.h"
+#include "notesstorejob.h"
 
-class CreateNoteJob : public EvernoteJob
+class CreateNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
-    explicit CreateNoteJob(Note *note, QObject *parent = 0);
-
-    void run();
+    explicit CreateNoteJob(const QString &title, const QString &notebookGuid, const QString &content, QObject *parent = 0);
 
 signals:
-    void resultReady(NotesStore::ErrorCode errorCode, Note *note);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, evernote::edam::Note note);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
-    Note *m_note;
+    QString m_title;
+    QString m_notebookGuid;
+    QString m_content;
+
+    evernote::edam::Note m_resultNote;
 };
 
 #endif // CREATENOTEJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/deletenotejob.cpp'
--- src/plugin/Evernote/jobs/deletenotejob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.cpp	2013-12-14 00:07:45 +0000
@@ -21,18 +21,17 @@
 #include "deletenotejob.h"
 
 DeleteNoteJob::DeleteNoteJob(const QString &guid, QObject *parent):
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_guid(guid)
 {
 }
 
-void DeleteNoteJob::run()
-{
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-    try {
-        client()->deleteNote(token().toStdString(), m_guid.toStdString());
-    } catch(...) {
-        catchTransportException();
-    }
-    emit resultReady(errorCode, m_guid);
+void DeleteNoteJob::startJob()
+{
+    client()->deleteNote(token().toStdString(), m_guid.toStdString());
+}
+
+void DeleteNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_guid);
 }
 
=== modified file 'src/plugin/Evernote/jobs/deletenotejob.h'
--- src/plugin/Evernote/jobs/deletenotejob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.h	2013-12-14 00:07:45 +0000
@@ -1,18 +1,20 @@
 #ifndef DELETENOTEJOB_H
 #define DELETENOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class DeleteNoteJob : public EvernoteJob
+class DeleteNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     DeleteNoteJob(const QString &guid, QObject *parent = 0);
 
-    void run();
-
 signals:
-    void resultReady(NotesStore::ErrorCode errorCode, const QString &guid);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_guid;
 
=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-14 00:07:45 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "evernotejob.h"
+#include "evernoteconnection.h"
 
 // Thrift
 #include <arpa/inet.h> // seems thrift forgot this one
@@ -35,35 +36,67 @@
 
 EvernoteJob::EvernoteJob(QObject *parent) :
     QThread(parent),
-    m_token(NotesStore::instance()->token())
+    m_token(EvernoteConnection::instance()->token())
 {
     connect(this, &EvernoteJob::finished, this, &EvernoteJob::deleteLater);
 }
 
 EvernoteJob::~EvernoteJob()
 {
-
 }
 
-evernote::edam::NoteStoreClient *EvernoteJob::client()
+void EvernoteJob::run()
 {
-    return NotesStore::instance()->m_client;
+    if (m_token.isEmpty()) {
+        qWarning() << "No token set. Cannot execute job. (" << this->metaObject()->className() << ")";
+        emitJobDone(EvernoteConnection::ErrorCodeUserException, QStringLiteral("No token set."));
+        return;
+    }
+
+    try {
+        startJob();
+    } catch (const TTransportException & e) {
+
+        // The connection broke down. libthrift + evernote servers seem to be quite flaky
+        // so lets try to start the job once more.
+        qWarning() << "Got a transport exception:" << e.what() << ". Trying to reestablish connection...";
+        try {
+            resetConnection();
+            startJob();
+        } catch (const TTransportException &e) {
+            // Giving up... the connection seems to be down for real.
+            qWarning() << "Cannot reestablish connection:" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeConnectionLost, e.what());
+        } catch (const TApplicationException &e) {
+            qWarning() << "Cannot reestablish connection:" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeConnectionLost, e.what());
+        } catch (const evernote::edam::EDAMUserException &e) {
+            qWarning() << "EDAMUserException" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
+        } catch (const evernote::edam::EDAMSystemException &e) {
+            qWarning() << "EDAMSystemException" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
+        } catch (const evernote::edam::EDAMNotFoundException &e) {
+            qWarning() << "EDAMNotFoundException" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
+        }
+
+
+    } catch (const evernote::edam::EDAMUserException &e) {
+        qWarning() << "EDAMUserException" << e.what();
+        emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
+    } catch (const evernote::edam::EDAMSystemException &e) {
+        qWarning() << "EDAMSystemException" << e.what();
+        emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
+    } catch (const evernote::edam::EDAMNotFoundException &e) {
+        qWarning() << "EDAMNotFoundException" << e.what();
+        emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
+    }
+
+    emitJobDone(EvernoteConnection::ErrorCodeNoError, QString());
 }
 
 QString EvernoteJob::token()
 {
     return m_token;
 }
-
-void EvernoteJob::catchTransportException()
-{
-    try {
-        // this function is meant to be called from a catch block
-        // rethrow the exception to catch it again
-        throw;
-    } catch (const TTransportException & e) {
-        qDebug() <<  e.what();
-    } catch (const TException & e) {
-        qDebug() <<  e.what();
-    }
-}
 
=== modified file 'src/plugin/Evernote/jobs/evernotejob.h'
--- src/plugin/Evernote/jobs/evernotejob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/evernotejob.h	2013-12-14 00:07:45 +0000
@@ -3,13 +3,21 @@
 
 #include "notesstore.h"
 
-// Evernote SDK
-#include <NoteStore.h>
-#include <NoteStore_constants.h>
-#include <Errors_types.h>
-
 #include <QThread>
 
+/* How to create a new Job type:
+ * - Subclass EvernoteJob
+ * - Implement startJob() in which you do the call to evernote.
+ *   - No need to catch exceptions, EvernoteJob will deal with those.
+ * - Define a jobDone() signal with the result parameters you need.
+ *   - Keep the convention of jobDone(EvernoteConnection::ErrorCode errorCode, const QString &message [, ...])
+ * - Emit jobDone() in your implementation of emitJobDone().
+ *   - NOTE: emitJobDone() might be called with an error even before startJob() is triggered.
+ *
+ * Jobs can be enqueue()d in NotesStore.
+ * They will destroy themselves when finished.
+ * The jobqueue will take care about starting them.
+ */
 class EvernoteJob : public QThread
 {
     Q_OBJECT
@@ -17,12 +25,18 @@
     explicit EvernoteJob(QObject *parent = 0);
     virtual ~EvernoteJob();
 
+    void run() final;
+
+signals:
+    void connectionLost(const QString &errorMessage);
+
 protected:
-    evernote::edam::NoteStoreClient* client();
+    virtual void resetConnection() = 0;
+    virtual void startJob() = 0;
+    virtual void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage) = 0;
+
     QString token();
 
-    void catchTransportException();
-
 private:
     QString m_token;
 };
 
=== added file 'src/plugin/Evernote/jobs/expungenotebookjob.cpp'
--- src/plugin/Evernote/jobs/expungenotebookjob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/expungenotebookjob.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "expungenotebookjob.h"
+
+#include <QDebug>
+
+ExpungeNotebookJob::ExpungeNotebookJob(const QString &guid, QObject *parent) :
+    NotesStoreJob(parent),
+    m_guid(guid)
+{
+}
+
+void ExpungeNotebookJob::startJob()
+{
+    client()->expungeNotebook(token().toStdString(), m_guid.toStdString());
+}
+
+void ExpungeNotebookJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_guid);
+}
 
=== added file 'src/plugin/Evernote/jobs/expungenotebookjob.h'
--- src/plugin/Evernote/jobs/expungenotebookjob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/expungenotebookjob.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef DELETENOTEBOOKJOB_H
+#define DELETENOTEBOOKJOB_H
+
+#include "notesstorejob.h"
+
+class ExpungeNotebookJob : public NotesStoreJob
+{
+    Q_OBJECT
+public:
+    explicit ExpungeNotebookJob(const QString &guid, QObject *parent = 0);
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
+
+private slots:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_guid;
+};
+
+#endif // DELETENOTEBOOKJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotebooksjob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.cpp	2013-12-14 00:07:45 +0000
@@ -23,21 +23,17 @@
 #include <QDebug>
 
 FetchNotebooksJob::FetchNotebooksJob(QObject *parent) :
-    EvernoteJob(parent)
-{
-}
-
-
-void FetchNotebooksJob::run()
-{
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-    std::vector<evernote::edam::Notebook> results;
-    try {
-        client()->listNotebooks(results, token().toStdString());
-    } catch(evernote::edam::EDAMUserException) {
-        errorCode = NotesStore::ErrorCodeUserException;
-    } catch(evernote::edam::EDAMSystemException) {
-        errorCode = NotesStore::ErrorCodeSystemException;
-    }
-    emit resultReady(errorCode, results);
+    NotesStoreJob(parent)
+{
+}
+
+
+void FetchNotebooksJob::startJob()
+{
+    client()->listNotebooks(m_results, token().toStdString());
+}
+
+void FetchNotebooksJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_results);
 }
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.h'
--- src/plugin/Evernote/jobs/fetchnotebooksjob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.h	2013-12-14 00:07:45 +0000
@@ -1,18 +1,23 @@
 #ifndef FETCHNOTEBOOKSJOB_H
 #define FETCHNOTEBOOKSJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNotebooksJob : public EvernoteJob
+class FetchNotebooksJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit FetchNotebooksJob(QObject *parent = 0);
 
-    void run();
-
 signals:
-    void resultReady(NotesStore::ErrorCode errorCode, const std::vector<evernote::edam::Notebook> &results);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    std::vector<evernote::edam::Notebook> m_results;
 };
 
 #endif // FETCHNOTEBOOKSJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.cpp'
--- src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-12-14 00:07:45 +0000
@@ -21,27 +21,17 @@
 #include "fetchnotejob.h"
 
 FetchNoteJob::FetchNoteJob(const QString &guid, QObject *parent) :
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_guid(guid)
 {
 }
 
-void FetchNoteJob::run()
+void FetchNoteJob::startJob()
 {
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-    evernote::edam::Note result;
-    try {
-        client()->getNote(result, token().toStdString(), m_guid.toStdString(), true, true, false, false);
-    } catch (evernote::edam::EDAMUserException) {
-        errorCode = NotesStore::ErrorCodeUserException;
-    } catch (evernote::edam::EDAMSystemException) {
-        errorCode = NotesStore::ErrorCodeSystemException;
-    } catch (evernote::edam::EDAMNotFoundException) {
-        errorCode = NotesStore::ErrorCodeNotFoundExcpetion;
-    } catch (...) {
-        catchTransportException();
-        errorCode = NotesStore::ErrorCodeConnectionLost;
-    }
+    client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, false, false, false);
+}
 
-    emit resultReady(errorCode, result);
+void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit resultReady(errorCode, errorMessage, m_result);
 }
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.h'
--- src/plugin/Evernote/jobs/fetchnotejob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.h	2013-12-14 00:07:45 +0000
@@ -1,22 +1,28 @@
 #ifndef FETCHNOTEJOB_H
 #define FETCHNOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNoteJob : public EvernoteJob
+class FetchNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit FetchNoteJob(const QString &guid, QObject *parent = 0);
 
-    void run();
 signals:
-    void resultReady(NotesStore::ErrorCode error, const evernote::edam::Note &note);
+    void resultReady(EvernoteConnection::ErrorCode error, const QString &errorMessage, const evernote::edam::Note &note);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     evernote::edam::NoteStoreClient *m_client;
     QString m_token;
     QString m_guid;
+
+    evernote::edam::Note m_result;
+
 };
 
 #endif // FETCHNOTEJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-12-14 00:07:45 +0000
@@ -22,43 +22,52 @@
 
 #include "notesstore.h"
 
+// evernote sdk
+#include "Limits_constants.h"
+
 #include <QDebug>
 
-FetchNotesJob::FetchNotesJob( const QString &filterNotebookGuid, QObject *parent) :
-    EvernoteJob(parent),
-    m_filterNotebookGuid(filterNotebookGuid)
+FetchNotesJob::FetchNotesJob(const QString &filterNotebookGuid, const QString &searchWords, QObject *parent) :
+    NotesStoreJob(parent),
+    m_filterNotebookGuid(filterNotebookGuid),
+    m_searchWords(searchWords)
 {
 }
 
-void FetchNotesJob::run()
+void FetchNotesJob::startJob()
 {
     // TODO: fix start/end (use smaller chunks and continue fetching if there are more notes available)
     int32_t start = 0;
-    int32_t end = 10000;
+    evernote::limits::LimitsConstants limits;
+    int32_t end = limits.EDAM_USER_NOTES_MAX;
 
     // Prepare filter
     evernote::edam::NoteFilter filter;
     filter.notebookGuid = m_filterNotebookGuid.toStdString();
     filter.__isset.notebookGuid = !m_filterNotebookGuid.isEmpty();
 
+    filter.words = m_searchWords.toStdString();
+    filter.__isset.words = !m_searchWords.isEmpty();
+
     // Prepare ResultSpec
     evernote::edam::NotesMetadataResultSpec resultSpec;
+
     resultSpec.includeNotebookGuid = true;
     resultSpec.__isset.includeNotebookGuid = true;
+
+    resultSpec.includeCreated = true;
+    resultSpec.__isset.includeCreated = true;
+
     resultSpec.includeTitle = true;
     resultSpec.__isset.includeTitle = true;
 
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-    evernote::edam::NotesMetadataList results;
-
-    try {
-        client()->findNotesMetadata(results, token().toStdString(), filter, start, end, resultSpec);
-    } catch(evernote::edam::EDAMUserException) {
-        errorCode = NotesStore::ErrorCodeUserException;
-    } catch(evernote::edam::EDAMSystemException) {
-        errorCode = NotesStore::ErrorCodeSystemException;
-    } catch(evernote::edam::EDAMNotFoundException) {
-        errorCode = NotesStore::ErrorCodeNotFoundExcpetion;
-    }
-    emit resultReady(errorCode, results);
+    resultSpec.includeAttributes = true;
+    resultSpec.__isset.includeAttributes = true;
+
+    client()->findNotesMetadata(m_results, token().toStdString(), filter, start, end, resultSpec);
+}
+
+void FetchNotesJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_results);
 }
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.h'
--- src/plugin/Evernote/jobs/fetchnotesjob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.h	2013-12-14 00:07:45 +0000
@@ -1,21 +1,25 @@
 #ifndef FETCHNOTESJOB_H
 #define FETCHNOTESJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNotesJob : public EvernoteJob
+class FetchNotesJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
-    explicit FetchNotesJob(const QString &filterNotebookGuid, QObject *parent = 0);
-
-    void run();
+    explicit FetchNotesJob(const QString &filterNotebookGuid = QString(), const QString &searchWords = QString(), QObject *parent = 0);
 
 signals:
-    void resultReady(NotesStore::ErrorCode errorCode, const evernote::edam::NotesMetadataList &results);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_filterNotebookGuid;
+    QString m_searchWords;
+    evernote::edam::NotesMetadataList m_results;
 };
 
 #endif // FETCHNOTESJOB_H
 
=== added file 'src/plugin/Evernote/jobs/fetchusernamejob.cpp'
--- src/plugin/Evernote/jobs/fetchusernamejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/fetchusernamejob.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "fetchusernamejob.h"
+
+FetchUsernameJob::FetchUsernameJob(QObject *parent) :
+    UserStoreJob(parent)
+{
+}
+
+void FetchUsernameJob::startJob()
+{
+    evernote::edam::User user;
+    client()->getUser(user, token().toStdString());
+    m_result = QString::fromStdString(user.username);
+}
+
+void FetchUsernameJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_result);
+}
 
=== added file 'src/plugin/Evernote/jobs/fetchusernamejob.h'
--- src/plugin/Evernote/jobs/fetchusernamejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/fetchusernamejob.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef FETCHUSERNAMEJOB_H
+#define FETCHUSERNAMEJOB_H
+
+#include "userstorejob.h"
+
+class FetchUsernameJob : public UserStoreJob
+{
+    Q_OBJECT
+public:
+    explicit FetchUsernameJob(QObject *parent = 0);
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_result;
+};
+
+#endif // FETCHUSERNAMEJOB_H
 
=== added file 'src/plugin/Evernote/jobs/notesstorejob.cpp'
--- src/plugin/Evernote/jobs/notesstorejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/notesstorejob.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "notesstorejob.h"
+
+#include "evernoteconnection.h"
+
+NotesStoreJob::NotesStoreJob(QObject *parent) :
+    EvernoteJob(parent)
+{
+}
+
+void NotesStoreJob::resetConnection()
+{
+    EvernoteConnection::instance()->m_notesStoreHttpClient->close();
+    EvernoteConnection::instance()->m_notesStoreHttpClient->open();
+}
+
+evernote::edam::NoteStoreClient *NotesStoreJob::client() const
+{
+    return EvernoteConnection::instance()->m_notesStoreClient;
+}
 
=== added file 'src/plugin/Evernote/jobs/notesstorejob.h'
--- src/plugin/Evernote/jobs/notesstorejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/notesstorejob.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef NOTESSTOREJOB_H
+#define NOTESSTOREJOB_H
+
+#include "evernotejob.h"
+
+// Evernote SDK
+#include <NoteStore.h>
+#include <NoteStore_constants.h>
+#include <Errors_types.h>
+
+class NotesStoreJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit NotesStoreJob(QObject *parent = 0);
+
+protected:
+    void resetConnection() final;
+
+    evernote::edam::NoteStoreClient *client() const;
+
+};
+
+#endif // NOTESSTOREJOB_H
 
=== modified file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2013-12-14 00:07:45 +0000
@@ -24,37 +24,40 @@
 #include <QDebug>
 
 SaveNoteJob::SaveNoteJob(Note *note, QObject *parent) :
-    EvernoteJob(parent),
-    m_note(note)
-{
-}
-
-void SaveNoteJob::run()
-{
-    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
-    try {
-        evernote::edam::Note note;
-        note.guid = m_note->guid().toStdString();
-        note.__isset.guid = true;
-        note.title = m_note->title().toStdString();
-        note.__isset.title = true;
-        note.notebookGuid = m_note->notebookGuid().toStdString();
-        note.__isset.notebookGuid = true;
-        note.content = m_note->content().toStdString();
-        note.__isset.content = true;
-        note.contentLength = m_note->content().length();
-
-        client()->updateNote(note, token().toStdString(), note);
-
-    } catch (evernote::edam::EDAMUserException e) {
-        errorCode = NotesStore::ErrorCodeUserException;
-        qDebug() << QString::fromStdString(e.parameter);
-    } catch (evernote::edam::EDAMSystemException) {
-        errorCode = NotesStore::ErrorCodeSystemException;
-    } catch (...) {
-        catchTransportException();
-        errorCode = NotesStore::ErrorCodeConnectionLost;
-    }
-
-    emit resultReady(errorCode, m_note);
+    NotesStoreJob(parent)
+{
+    // Need to clone it. As startJob() will run in another thread we can't access the real note from there.
+    m_note = note->clone();
+
+    // Make sure we delete the clone when done
+    m_note->setParent(this);
+}
+
+void SaveNoteJob::startJob()
+{
+    evernote::edam::Note note;
+    note.guid = m_note->guid().toStdString();
+    note.__isset.guid = true;
+    note.title = m_note->title().toStdString();
+    note.__isset.title = true;
+    note.notebookGuid = m_note->notebookGuid().toStdString();
+    note.__isset.notebookGuid = true;
+    note.content = m_note->content().toStdString();
+    note.__isset.content = true;
+    note.contentLength = m_note->content().length();
+
+    note.__isset.attributes = true;
+    note.attributes.reminderOrder = m_note->reminderOrder();
+    note.attributes.__isset.reminderOrder = true;
+    note.attributes.reminderTime = m_note->reminderTime().toMSecsSinceEpoch();
+    note.attributes.__isset.reminderTime = true;
+    note.attributes.reminderDoneTime = m_note->reminderDoneTime().toMSecsSinceEpoch();
+    note.attributes.__isset.reminderDoneTime = true;
+
+    client()->updateNote(m_resultNote, token().toStdString(), note);
+}
+
+void SaveNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_resultNote);
 }
 
=== modified file 'src/plugin/Evernote/jobs/savenotejob.h'
--- src/plugin/Evernote/jobs/savenotejob.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/jobs/savenotejob.h	2013-12-14 00:07:45 +0000
@@ -1,20 +1,24 @@
 #ifndef SAVENOTEJOB_H
 #define SAVENOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class SaveNoteJob : public EvernoteJob
+class SaveNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit SaveNoteJob(Note *note, QObject *parent = 0);
 
-    void run();
 signals:
-    void resultReady(NotesStore::ErrorCode errorCode, Note *note);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &note);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
-    Note *m_note;
+    Note* m_note;
+    evernote::edam::Note m_resultNote;
 };
 
 #endif // SAVENOTEJOB_H
 
=== added file 'src/plugin/Evernote/jobs/userstorejob.cpp'
--- src/plugin/Evernote/jobs/userstorejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/userstorejob.cpp	2013-12-14 00:07:45 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "userstorejob.h"
+
+#include "evernoteconnection.h"
+
+UserStoreJob::UserStoreJob(QObject *parent) :
+    EvernoteJob(parent)
+{
+}
+
+void UserStoreJob::resetConnection()
+{
+    EvernoteConnection::instance()->m_userStoreHttpClient->close();
+    EvernoteConnection::instance()->m_userStoreHttpClient->open();
+}
+
+evernote::edam::UserStoreClient *UserStoreJob::client() const
+{
+    return EvernoteConnection::instance()->m_userstoreClient;
+}
 
=== added file 'src/plugin/Evernote/jobs/userstorejob.h'
--- src/plugin/Evernote/jobs/userstorejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/userstorejob.h	2013-12-14 00:07:45 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef USERSTOREJOB_H
+#define USERSTOREJOB_H
+
+#include "evernotejob.h"
+
+// Evernote SDK
+#include <UserStore.h>
+#include <UserStore_constants.h>
+#include <Errors_types.h>
+
+class UserStoreJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit UserStoreJob(QObject *parent = 0);
+
+protected:
+    void resetConnection() final;
+
+    evernote::edam::UserStoreClient* client() const;
+
+public slots:
+
+};
+
+#endif // USERSTOREJOB_H
 
=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/note.cpp	2013-12-14 00:07:45 +0000
@@ -21,10 +21,16 @@
 #include "note.h"
 
 #include "notesstore.h"
-
-Note::Note(const QString &guid, QObject *parent) :
+#include "utils/html2enmlconverter.h"
+
+#include <QDateTime>
+#include <QDebug>
+
+Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
     QObject(parent),
-    m_guid(guid)
+    m_guid(guid),
+    m_created(created),
+    m_isSearchResult(false)
 {
 }
 
@@ -33,14 +39,6 @@
     return m_guid;
 }
 
-void Note::setGuid(const QString &guid)
-{
-    if (m_guid == guid) {
-        m_guid = guid;
-        emit guidChanged();
-    }
-}
-
 QString Note::notebookGuid() const
 {
     return m_notebookGuid;
@@ -54,6 +52,11 @@
     }
 }
 
+QDateTime Note::created() const
+{
+    return m_created;
+}
+
 QString Note::title() const
 {
     return m_title;
@@ -76,10 +79,111 @@
 {
     if (m_content != content) {
         m_content = content;
+        m_plaintextContent = Html2EnmlConverter::enml2plaintext(content);
+        qDebug() << "plaintext content is" << m_plaintextContent;
         emit contentChanged();
     }
 }
 
+QString Note::plaintextContent() const
+{
+    return m_plaintextContent;
+}
+
+bool Note::reminder() const
+{
+    return m_reminderOrder > 0;
+}
+
+void Note::setReminder(bool reminder)
+{
+    if (reminder && m_reminderOrder == 0) {
+        m_reminderOrder = QDateTime::currentMSecsSinceEpoch();
+        emit reminderChanged();
+    } else if (!reminder && m_reminderOrder > 0) {
+        m_reminderOrder = 0;
+        emit reminderChanged();
+    }
+}
+
+qint64 Note::reminderOrder() const
+{
+    return m_reminderOrder;
+}
+
+void Note::setReminderOrder(qint64 reminderOrder)
+{
+    if (m_reminderOrder != reminderOrder) {
+        m_reminderOrder = reminderOrder;
+        emit reminderChanged();
+    }
+}
+
+QDateTime Note::reminderTime() const
+{
+    return m_reminderTime;
+}
+
+void Note::setReminderTime(const QDateTime &reminderTime)
+{
+    if (m_reminderTime != reminderTime) {
+        m_reminderTime = reminderTime;
+        emit reminderTimeChanged();
+    }
+}
+
+bool Note::reminderDone() const
+{
+    return !m_reminderDoneTime.isNull();
+}
+
+void Note::setReminderDone(bool reminderDone)
+{
+    if (reminderDone && m_reminderDoneTime.isNull()) {
+        m_reminderDoneTime = QDateTime::currentDateTime();
+        emit reminderDoneChanged();
+    }
+}
+
+QDateTime Note::reminderDoneTime() const
+{
+    return m_reminderDoneTime;
+}
+
+void Note::setReminderDoneTime(const QDateTime &reminderDoneTime)
+{
+    if (m_reminderDoneTime != reminderDoneTime) {
+        m_reminderDoneTime = reminderDoneTime;
+        emit reminderDoneChanged();
+    }
+}
+
+bool Note::isSearchResult() const
+{
+    return m_isSearchResult;
+}
+
+void Note::setIsSearchResult(bool isSearchResult)
+{
+    if (m_isSearchResult != isSearchResult) {
+        m_isSearchResult = isSearchResult;
+        emit isSearchResultChanged();
+    }
+}
+
+Note *Note::clone()
+{
+    Note *note = new Note(m_guid, m_created);
+    note->setNotebookGuid(m_notebookGuid);
+    note->setTitle(m_title);
+    note->setContent(m_content);
+    note->setReminderOrder(m_reminderOrder);
+    note->setReminderTime(m_reminderTime);
+    note->setReminderDoneTime(m_reminderDoneTime);
+    note->setIsSearchResult(m_isSearchResult);
+    return note;
+}
+
 void Note::save()
 {
     NotesStore::instance()->saveNote(m_guid);
 
=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/note.h	2013-12-14 00:07:45 +0000
@@ -2,45 +2,96 @@
 #define NOTE_H
 
 #include <QObject>
+#include <QDateTime>
+#include <QStringList>
 
 class Note : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString guid READ guid NOTIFY guidChanged)
+    // Don't forget to update clone() if you add properties!
+    Q_PROPERTY(QString guid READ guid CONSTANT)
     Q_PROPERTY(QString notebookGuid READ notebookGuid WRITE setNotebookGuid NOTIFY notebookGuidChanged)
+    Q_PROPERTY(QDateTime created READ created CONSTANT)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString content READ content WRITE setContent NOTIFY contentChanged)
+    Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
+    Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
+    Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
+    Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
+    Q_PROPERTY(QDateTime reminderDoneTime READ reminderDoneTime WRITE setReminderDoneTime NOTIFY reminderDoneChanged)
+    Q_PROPERTY(bool isSearchResult READ isSearchResult NOTIFY isSearchResultChanged)
+    // Don't forget to update clone() if you add properties!
+
 public:
-    explicit Note(const QString &guid = QString(), QObject *parent = 0);
+    explicit Note(const QString &guid, const QDateTime &created, QObject *parent = 0);
 
     QString guid() const;
-    void setGuid(const QString &guid);
 
     QString notebookGuid() const;
     void setNotebookGuid(const QString &notebookGuid);
 
+    QDateTime created() const;
+
     QString title() const;
     void setTitle(const QString &title);
 
     QString content() const;
     void setContent(const QString &content);
 
+    QString plaintextContent() const;
+    void setPlaintextContent(const QString &plaintextContent);
+
+    // This is the QML representation as we don't want to deal with timestamps there.
+    // setting it to false will reset the reminderOrder to 0, setting it to true will
+    // create a new timestamp for it.
+    bool reminder() const;
+    void setReminder(bool reminder);
+
+    qint64 reminderOrder() const;
+    void setReminderOrder(qint64 reminderOrder);
+
+    QDateTime reminderTime() const;
+    void setReminderTime(const QDateTime &reminderTime);
+
+    // This is the QML representation as we don't want to deal with timestamps there.
+    // setting it to false will reset reminderDoneTime to 0, setting it to true will
+    // create a new timestamp for it.
+    bool reminderDone() const;
+    void setReminderDone(bool reminderDone);
+
+    QDateTime reminderDoneTime() const;
+    void setReminderDoneTime(const QDateTime &reminderDoneTime);
+
+    bool isSearchResult() const;
+    void setIsSearchResult(bool isSearchResult);
+
+    Note* clone();
+
 public slots:
     void save();
     void remove();
 
 signals:
-    void guidChanged();
     void titleChanged();
     void notebookGuidChanged();
     void contentChanged();
+    void reminderChanged();
+    void reminderTimeChanged();
+    void reminderDoneChanged();
+    void isSearchResultChanged();
 
 private:
     QString m_guid;
     QString m_notebookGuid;
+    QDateTime m_created;
     QString m_title;
     QString m_content;
+    QString m_plaintextContent;
+    qint64 m_reminderOrder;
+    QDateTime m_reminderTime;
+    QDateTime m_reminderDoneTime;
+    bool m_isSearchResult;
 };
 
 #endif // NOTE_H
 
=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/notebooks.cpp	2013-12-14 00:07:45 +0000
@@ -35,7 +35,6 @@
 
 QVariant Notebooks::data(const QModelIndex &index, int role) const
 {
-
     Notebook *notebook = NotesStore::instance()->notebook(m_list.at(index.row()));
     switch(role) {
     case RoleGuid:
 
=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/notes.cpp	2013-12-14 00:07:45 +0000
@@ -24,37 +24,12 @@
 #include <QDebug>
 
 Notes::Notes(QObject *parent) :
-    QAbstractListModel(parent)
-{
-    connect(NotesStore::instance(), &NotesStore::noteAdded, this, &Notes::noteAdded);
-    connect(NotesStore::instance(), &NotesStore::noteRemoved, this, &Notes::noteRemoved);
-    connect(NotesStore::instance(), &NotesStore::noteChanged, this, &Notes::noteChanged);
-}
-
-QVariant Notes::data(const QModelIndex &index, int role) const
-{
-    Note *note = NotesStore::instance()->note(m_list.at(index.row()));
-    switch(role) {
-    case RoleGuid:
-        return note->guid();
-    case RoleTitle:
-        return note->title();
-    }
-
-    return QVariant();
-}
-
-int Notes::rowCount(const QModelIndex &parent) const
-{
-    return m_list.count();
-}
-
-QHash<int, QByteArray> Notes::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(RoleGuid, "guid");
-    roles.insert(RoleTitle, "title");
-    return roles;
+    QSortFilterProxyModel(parent),
+    m_onlyReminders(false)
+{
+    setSourceModel(NotesStore::instance());
+    setSortRole(NotesStore::RoleCreated);
+    sort(0, Qt::DescendingOrder);
 }
 
 QString Notes::filterNotebookGuid() const
@@ -67,53 +42,56 @@
     if (m_filterNotebookGuid != notebookGuid) {
         m_filterNotebookGuid = notebookGuid;
         emit filterNotebookGuidChanged();
-    }
-}
-
-Note* Notes::note(const QString &guid)
-{
-    NotesStore::instance()->refreshNoteContent(guid);
-    return NotesStore::instance()->note(guid);
-}
-
-void Notes::componentComplete()
-{
-    foreach (Note *note, NotesStore::instance()->notes()) {
-        if (m_filterNotebookGuid.isEmpty() || note->notebookGuid() == m_filterNotebookGuid) {
-            m_list.append(note->guid());
-        }
-    }
-    beginInsertRows(QModelIndex(), 0, m_list.count() - 1);
-    endInsertRows();
-    refresh();
-}
-
-void Notes::refresh()
-{
-    NotesStore::instance()->refreshNotes(m_filterNotebookGuid);
-}
-
-void Notes::noteAdded(const QString &guid)
-{
-    beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
-    m_list.append(guid);
-    endInsertRows();
-}
-
-void Notes::noteChanged(const QString &guid)
-{
-    int row = m_list.indexOf(guid);
-    if (row >= 0) {
-        emit dataChanged(index(row), index(row));
-    }
-}
-
-void Notes::noteRemoved(const QString &guid)
-{
-    int index = m_list.indexOf(guid);
-    if (index >= 0) {
-        beginRemoveRows(QModelIndex(), index, index);
-        m_list.removeAt(index);
-        endRemoveRows();
-    }
+        invalidateFilter();
+    }
+}
+
+bool Notes::onlyReminders() const
+{
+    return m_onlyReminders;
+}
+
+void Notes::setOnlyReminders(bool onlyReminders)
+{
+    if (m_onlyReminders != onlyReminders) {
+        m_onlyReminders = onlyReminders;
+        emit onlyRemindersChanged();
+        invalidateFilter();
+    }
+}
+
+bool Notes::onlySearchResults() const
+{
+    return m_onlySearchResults;
+}
+
+void Notes::setOnlySearchResults(bool onlySearchResults)
+{
+    if (m_onlySearchResults != onlySearchResults) {
+        m_onlySearchResults = onlySearchResults;
+        emit onlySearchResultsChanged();
+        invalidateFilter();
+    }
+}
+
+bool Notes::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+    if (!m_filterNotebookGuid.isEmpty()) {
+        if (sourceModel()->data(sourceIndex, NotesStore::RoleNotebookGuid).toString() != m_filterNotebookGuid) {
+            return false;
+        }
+    }
+    if (m_onlyReminders) {
+        if (!sourceModel()->data(sourceIndex, NotesStore::RoleReminder).toBool()) {
+            return false;
+        }
+    }
+    if (m_onlySearchResults) {
+        Note *note = NotesStore::instance()->note(sourceModel()->data(sourceIndex, NotesStore::RoleGuid).toString());
+        if (!note->isSearchResult()) {
+            return false;
+        }
+    }
+    return true;
 }
 
=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/notes.h	2013-12-14 00:07:45 +0000
@@ -3,47 +3,39 @@
 
 #include "notesstore.h"
 
-#include <QAbstractListModel>
-#include <QQmlParserStatus>
+#include <QSortFilterProxyModel>
 
-class Notes : public QAbstractListModel, public QQmlParserStatus
+class Notes : public QSortFilterProxyModel
 {
     Q_OBJECT
     Q_PROPERTY(QString filterNotebookGuid READ filterNotebookGuid WRITE setFilterNotebookGuid NOTIFY filterNotebookGuidChanged)
+    Q_PROPERTY(bool onlyReminders READ onlyReminders WRITE setOnlyReminders NOTIFY onlyRemindersChanged)
+    Q_PROPERTY(bool onlySearchResults READ onlySearchResults WRITE setOnlySearchResults NOTIFY onlySearchResultsChanged)
+
 public:
-    enum Roles {
-        RoleGuid,
-        RoleTitle
-    };
     explicit Notes(QObject *parent = 0);
 
-    QVariant data(const QModelIndex &index, int role) const;
-    int rowCount(const QModelIndex &parent) const;
-    QHash<int, QByteArray> roleNames() const;
-
     QString filterNotebookGuid() const;
     void setFilterNotebookGuid(const QString &notebookGuid);
 
-    Q_INVOKABLE Note* note(const QString &guid);
-
-    void classBegin() {}
-    void componentComplete();
-
-public slots:
-    void refresh();
-
-private slots:
-    void noteAdded(const QString &guid);
-    void noteChanged(const QString &guid);
-    void noteRemoved(const QString &guid);
+    bool onlyReminders() const;
+    void setOnlyReminders(bool onlyReminders);
+
+    bool onlySearchResults() const;
+    void setOnlySearchResults(bool onlySearchResults);
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
 signals:
     void filterNotebookGuidChanged();
+    void onlyRemindersChanged();
+    void onlySearchResultsChanged();
 
 private:
-    QList<QString> m_list;
     QString m_filterNotebookGuid;
-
+    bool m_onlyReminders;
+    bool m_onlySearchResults;
 };
 
 #endif // NOTES_H
 
=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-11-27 17:33:36 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-12-14 00:07:45 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "notesstore.h"
+#include "evernoteconnection.h"
 #include "notebooks.h"
 #include "notebook.h"
 #include "note.h"
@@ -30,73 +31,24 @@
 #include "jobs/createnotejob.h"
 #include "jobs/savenotejob.h"
 #include "jobs/deletenotejob.h"
-
-// Thrift
-#include <arpa/inet.h> // seems thrift forgot this one
-#include <protocol/TBinaryProtocol.h>
-#include <transport/THttpClient.h>
-#include <transport/TSSLSocket.h>
-#include <Thrift.h>
+#include "jobs/createnotebookjob.h"
+#include "jobs/expungenotebookjob.h"
 
 #include <QDebug>
 
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-
 NotesStore* NotesStore::s_instance = 0;
 
 NotesStore::NotesStore(QObject *parent) :
-    QObject(parent),
-    m_currentJob(0)
+    QAbstractListModel(parent)
 {
-    try {
-        // FIXME: need to populate this string from the system
-        // The structure should be:
-        // application/version; platform/version; [ device/version ]
-        // E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
-        QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
-        QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
-        QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/note");
-        boost::shared_ptr<TSocket> socket;
-        bool use_SSL = true;
-
-        if (use_SSL) {
-            // Create an SSL socket
-            // FIXME: this fails with the following error:
-            //   Thrift: Fri Nov 15 12:47:31 2013 SSL_shutdown: error code: 0
-            //   SSL_get_verify_result(), unable to get local issuer certificate
-            // Additionally, the UI blocks and does not load for about 2 minutes
-            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
-            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
-            qDebug() << "created SSL socket";
-        } else {
-            // Create a non-secure socket
-            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
-            qDebug() << "created insecure socket";
-        }
-
-        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
-        boost::shared_ptr<THttpClient> userStoreHttpClient (new THttpClient(bufferedTransport,
-                                                                            EVERNOTE_HOST.toStdString(),
-                                                                            EDAM_USER_STORE_PATH.toStdString()));
-        userStoreHttpClient->open();
-
-        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(userStoreHttpClient));
-        m_client = new evernote::edam::NoteStoreClient(iprot);
-
-        qDebug() << "NoteStore client created.";
-
-    } catch (const TTransportException & e) {
-        qWarning() << "Failed to create Transport:" <<  e.what();
-    } catch (const TException & e) {
-        qWarning() << "Generic Thrift exception:" << e.what();
-    }
-
-    qRegisterMetaType<NotesStore::ErrorCode>("NotesStore::ErrorCode");
+    connect(EvernoteConnection::instance(), &EvernoteConnection::tokenChanged, this, &NotesStore::refreshNotebooks);
+    connect(EvernoteConnection::instance(), SIGNAL(tokenChanged()), this, SLOT(refreshNotes()));
+
+    qRegisterMetaType<EvernoteConnection::ErrorCode>("EvernoteConnection::ErrorCode");
     qRegisterMetaType<evernote::edam::NotesMetadataList>("evernote::edam::NotesMetadataList");
     qRegisterMetaType<evernote::edam::Note>("evernote::edam::Note");
     qRegisterMetaType<std::vector<evernote::edam::Notebook> >("std::vector<evernote::edam::Notebook>");
+    qRegisterMetaType<evernote::edam::Notebook>("evernote::edam::Notebook");
 
 }
 
@@ -108,255 +60,317 @@
     return s_instance;
 }
 
-QString NotesStore::errorCodeToString(NotesStore::ErrorCode errorCode)
-{
-    switch(errorCode) {
-    case ErrorCodeNoError:
-        return QStringLiteral("No error");
-    case ErrorCodeUserException:
-        return QStringLiteral("User exception");
-    case ErrorCodeSystemException:
-        return QStringLiteral("System exception");
-    case ErrorCodeNotFoundExcpetion:
-        return QStringLiteral("Not found");
+int NotesStore::rowCount(const QModelIndex &parent) const
+{
+    return m_notes.count();
+}
+
+QVariant NotesStore::data(const QModelIndex &index, int role) const
+{
+    switch (role) {
+    case RoleGuid:
+        return m_notes.at(index.row())->guid();
+    case RoleNotebookGuid:
+        return m_notes.at(index.row())->notebookGuid();
+    case RoleCreated:
+        return m_notes.at(index.row())->created();
+    case RoleTitle:
+        return m_notes.at(index.row())->title();
+    case RoleReminder:
+        return m_notes.at(index.row())->reminder();
+    case RoleReminderTime:
+        return m_notes.at(index.row())->reminderTime();
+    case RoleReminderDone:
+        return m_notes.at(index.row())->reminderDone();
+    case RoleReminderDoneTime:
+        return m_notes.at(index.row())->reminderDoneTime();
     }
-    return QString();
+    return QVariant();
+}
+
+QHash<int, QByteArray> NotesStore::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(RoleGuid, "guid");
+    roles.insert(RoleNotebookGuid, "notebookGuid");
+    roles.insert(RoleCreated, "created");
+    roles.insert(RoleTitle, "title");
+    roles.insert(RoleReminder, "reminder");
+    roles.insert(RoleReminderTime, "reminderTime");
+    roles.insert(RoleReminderDone, "reminderDone");
+    roles.insert(RoleReminderDoneTime, "reminderDoneTime");
+    return roles;
 }
 
 NotesStore::~NotesStore()
 {
-    delete m_client;
-}
-
-QString NotesStore::token() const
-{
-    return m_token;
-}
-
-void NotesStore::setToken(const QString &token)
-{
-    if (token != m_token) {
-        m_token = token;
-        emit tokenChanged();
-        refreshNotebooks();
-        refreshNotes();
-    }
 }
 
 QList<Note*> NotesStore::notes() const
 {
-    return m_notes.values();
+    return m_notes;
 }
 
 Note *NotesStore::note(const QString &guid)
 {
-    return m_notes.value(guid);
-}
-
-void NotesStore::saveNote(const QString &guid)
-{
-    Note *note = m_notes.value(guid);
-
-    QString enml = Html2EnmlConverter::html2enml(note->content());
-    note->setContent(enml);
-
-    SaveNoteJob *job = new SaveNoteJob(note, this);
-    connect(job, &SaveNoteJob::resultReady, this, &NotesStore::saveNoteJobDone);
-    m_jobQueue.append(job);
-    startJobQueue();
-}
-
-void NotesStore::deleteNote(const QString &guid)
-{
-    DeleteNoteJob *job = new DeleteNoteJob(guid, this);
-    connect(job, &DeleteNoteJob::resultReady, this, &NotesStore::deleteNoteJobDone);
-    m_jobQueue.append(job);
-    startJobQueue();
+    return m_notesHash.value(guid);
 }
 
 QList<Notebook *> NotesStore::notebooks() const
 {
-    return m_notebooks.values();
+    return m_notebooks;
 }
 
 Notebook *NotesStore::notebook(const QString &guid)
 {
-    return m_notebooks.value(guid);
-}
-
-void NotesStore::startJobQueue()
-{
-    if (m_jobQueue.isEmpty()) {
-        return;
-    }
-
-    if (m_currentJob) {
-        return;
-    }
-    m_currentJob = m_jobQueue.takeFirst();
-    m_currentJob->start();
-}
-
-void NotesStore::startNextJob()
-{
-    m_currentJob = 0;
-    startJobQueue();
+    return m_notebooksHash.value(guid);
+}
+
+void NotesStore::createNotebook(const QString &name)
+{
+    CreateNotebookJob *job = new CreateNotebookJob(name);
+    connect(job, &CreateNotebookJob::jobDone, this, &NotesStore::createNotebookJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::expungeNotebook(const QString &guid)
+{
+    ExpungeNotebookJob *job = new ExpungeNotebookJob(guid);
+    connect(job, &ExpungeNotebookJob::jobDone, this, &NotesStore::expungeNotebookJobDone);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
 void NotesStore::refreshNotes(const QString &filterNotebookGuid)
 {
-    if (m_token.isEmpty()) {
-        qWarning() << "No token set. Cannot fetch notes.";
-        return;
-    }
-
     FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
-    connect(job, &FetchNotesJob::resultReady, this, &NotesStore::fetchNotesJobDone);
-
-    m_jobQueue.append(job);
-    startJobQueue();
+    connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNotesJobDone(ErrorCode errorCode, const evernote::edam::NotesMetadataList &results)
+void NotesStore::fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results)
 {
-    if (errorCode != ErrorCodeNoError) {
-        qWarning() << "Failed to fetch notes list:" << errorCodeToString(errorCode);
-        startNextJob();
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Failed to fetch notes list:" << errorMessage;
         return;
     }
 
     for (int i = 0; i < results.notes.size(); ++i) {
         evernote::edam::NoteMetadata result = results.notes.at(i);
-        Note *note = m_notes.value(QString::fromStdString(result.guid));
-        if (note) {
-            note->setTitle(QString::fromStdString(result.title));
-            note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+        Note *note = m_notesHash.value(QString::fromStdString(result.guid));
+        bool newNote = note == 0;
+        if (newNote) {
+            QString guid = QString::fromStdString(result.guid);
+            QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
+            note = new Note(guid, created, this);
+        }
+
+        note->setTitle(QString::fromStdString(result.title));
+        note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+        note->setReminderOrder(result.attributes.reminderOrder);
+
+        if (!results.searchedWords.empty()) {
+            note->setIsSearchResult(true);
+        }
+
+        QDateTime reminderDoneTime;
+        if (result.attributes.reminderDoneTime > 0) {
+            reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
+        }
+        note->setReminderDoneTime(reminderDoneTime);
+
+        if (newNote) {
+            beginInsertRows(QModelIndex(), m_notes.count(), m_notes.count());
+            m_notesHash.insert(note->guid(), note);
+            m_notes.append(note);
+            endInsertRows();
+            emit noteAdded(note->guid());
+        } else {
+            QModelIndex noteIndex = index(m_notes.indexOf(note));
+            emit dataChanged(noteIndex, noteIndex);
             emit noteChanged(note->guid());
-        } else {
-            note = new Note(QString::fromStdString(result.guid), this);
-            note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
-            note->setTitle(QString::fromStdString(result.title));
-            m_notes.insert(note->guid(), note);
-            emit noteAdded(note->guid());
         }
     }
-
-    startNextJob();
 }
 
 void NotesStore::refreshNoteContent(const QString &guid)
 {
-    if (m_token.isEmpty()) {
-        qWarning() << "No token set. Cannot fetch note.";
-        return;
-    }
-
     FetchNoteJob *job = new FetchNoteJob(guid, this);
     connect(job, &FetchNoteJob::resultReady, this, &NotesStore::fetchNoteJobDone);
-    m_jobQueue.append(job);
-
-    startJobQueue();
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNoteJobDone(ErrorCode errorCode, const evernote::edam::Note &result)
+void NotesStore::fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
 {
-    if (errorCode != ErrorCodeNoError) {
-        qWarning() << "Error fetching note:" << errorCode;
-        startNextJob();
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error fetching note:" << errorMessage;
         return;
     }
 
-    Note *note = m_notes.value(QString::fromStdString(result.guid));
+    Note *note = m_notesHash.value(QString::fromStdString(result.guid));
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
     note->setContent(QString::fromStdString(result.content));
+    note->setReminderOrder(result.attributes.reminderOrder);
+    QDateTime reminderDoneTime;
+    if (result.attributes.reminderDoneTime > 0) {
+        reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
+    }
+    note->setReminderDoneTime(reminderDoneTime);
     emit noteChanged(note->guid());
 
-    startNextJob();
+    QModelIndex noteIndex = index(m_notes.indexOf(note));
+    emit dataChanged(noteIndex, noteIndex);
 }
 
 void NotesStore::refreshNotebooks()
 {
-    if (m_token.isEmpty()) {
-        qWarning() << "No token set. Cannot refresh notebooks.";
-        return;
-    }
-
     FetchNotebooksJob *job = new FetchNotebooksJob();
-    connect(job, &FetchNotebooksJob::resultReady, this, &NotesStore::fetchNotebooksJobDone);
-
-    m_jobQueue.append(job);
-    startJobQueue();
+    connect(job, &FetchNotebooksJob::jobDone, this, &NotesStore::fetchNotebooksJobDone);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNotebooksJobDone(ErrorCode errorCode, const std::vector<evernote::edam::Notebook> &results)
+void NotesStore::fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results)
 {
-    if (errorCode != ErrorCodeNoError) {
-        qWarning() << "Error fetching notebooks:" << errorCodeToString(errorCode);
-        startNextJob();
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error fetching notebooks:" << errorMessage;
         return;
     }
 
     for (int i = 0; i < results.size(); ++i) {
         evernote::edam::Notebook result = results.at(i);
-        Notebook *notebook = m_notebooks.value(QString::fromStdString(result.guid));
-        if (notebook) {
-            qDebug() << "got notebook update";
-            notebook->setName(QString::fromStdString(result.name));
-            emit notebookChanged(notebook->guid());
-        } else {
+        Notebook *notebook = m_notebooksHash.value(QString::fromStdString(result.guid));
+        bool newNoteNotebook = notebook == 0;
+        if (newNoteNotebook) {
             notebook = new Notebook(QString::fromStdString(result.guid), this);
-            notebook->setName(QString::fromStdString(result.name));
-            m_notebooks.insert(notebook->guid(), notebook);
+        }
+        notebook->setName(QString::fromStdString(result.name));
+
+        if (newNoteNotebook) {
+            m_notebooksHash.insert(notebook->guid(), notebook);
+            m_notebooks.append(notebook);
             emit notebookAdded(notebook->guid());
-            qDebug() << "got new notebook" << notebook->guid();
+        } else {
+            emit notebookChanged(notebook->guid());
         }
     }
-
-    startNextJob();
 }
 
 void NotesStore::createNote(const QString &title, const QString &notebookGuid, const QString &content)
 {
-    Note *note = new Note();
-    note->setTitle(title);
-    note->setNotebookGuid(notebookGuid);
-    note->setContent(content);
-    CreateNoteJob *job = new CreateNoteJob(note);
-    connect(job, &CreateNoteJob::resultReady, this, &NotesStore::createNoteJobDone);
-
-    m_jobQueue.append(job);
-    startJobQueue();
-}
-
-void NotesStore::createNoteJobDone(NotesStore::ErrorCode errorCode, Note *note)
-{
-    if (errorCode != ErrorCodeNoError) {
-        qWarning() << "Error creating note:" << errorCodeToString(errorCode);
-        delete note;
-        startNextJob();
-        return;
-    }
-
-    m_notes.insert(note->guid(), note);
-    noteAdded(note->guid());
-    startNextJob();
-}
-
-void NotesStore::saveNoteJobDone(NotesStore::ErrorCode errorCode, Note *note)
-{
-    startNextJob();
-}
-
-void NotesStore::deleteNoteJobDone(NotesStore::ErrorCode errorCode, const QString &guid)
-{
-    if (errorCode != ErrorCodeNoError) {
-        qWarning() << "Cannot delete note:" << errorCodeToString(errorCode);
-        startNextJob();
+    CreateNoteJob *job = new CreateNoteJob(title, notebookGuid, content);
+    connect(job, &CreateNoteJob::jobDone, this, &NotesStore::createNoteJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error creating note:" << errorMessage;
+        return;
+    }
+
+    QString guid = QString::fromStdString(result.guid);
+    QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
+    Note *note = new Note(guid, created, this);
+    note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+    note->setTitle(QString::fromStdString(result.title));
+    note->setContent(QString::fromStdString(result.content));
+
+    beginInsertRows(QModelIndex(), m_notes.count(), m_notes.count());
+    m_notesHash.insert(note->guid(), note);
+    m_notes.append(note);
+    endInsertRows();
+
+    emit noteAdded(note->guid());
+}
+
+void NotesStore::saveNote(const QString &guid)
+{
+    Note *note = m_notesHash.value(guid);
+
+    QString enml = Html2EnmlConverter::html2enml(note->content());
+    note->setContent(enml);
+
+    SaveNoteJob *job = new SaveNoteJob(note, this);
+    connect(job, &SaveNoteJob::jobDone, this, &NotesStore::saveNoteJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "error saving note" << errorMessage;
+        return;
+    }
+
+    Note *note = m_notesHash.value(QString::fromStdString(result.guid));
+    if (note) {
+        note->setTitle(QString::fromStdString(result.title));
+        note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+
+        emit noteChanged(note->guid());
+
+        QModelIndex noteIndex = index(m_notes.indexOf(note));
+        emit dataChanged(noteIndex, noteIndex);
+    }
+}
+
+void NotesStore::deleteNote(const QString &guid)
+{
+    DeleteNoteJob *job = new DeleteNoteJob(guid, this);
+    connect(job, &DeleteNoteJob::jobDone, this, &NotesStore::deleteNoteJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::findNotes(const QString &searchWords)
+{
+    foreach (Note *note, m_notes) {
+        note->setIsSearchResult(false);
+    }
+    emit dataChanged(index(0), index(m_notes.count()), QVector<int>() << RoleIsSearchResult);
+
+    FetchNotesJob *job = new FetchNotesJob(QString(), searchWords);
+    connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Cannot delete note:" << errorMessage;
         return;
     }
     emit noteRemoved(guid);
-    m_notes.take(guid)->deleteLater();
-    startNextJob();
-}
-
+
+    Note *note = m_notesHash.value(guid);
+    int noteIndex = m_notes.indexOf(note);
+    beginRemoveRows(QModelIndex(), noteIndex, noteIndex);
+    m_notes.takeAt(noteIndex);
+    m_notesHash.take(guid)->deleteLater();
+    endRemoveRows();
+}
+
+void NotesStore::createNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error creating notebook:" << errorMessage;
+        return;
+    }
+    Notebook *notebook = new Notebook(QString::fromStdString(result.guid));
+    notebook->setName(QString::fromStdString(result.name));
+    m_notebooks.append(notebook);
+    m_notebooksHash.insert(notebook->guid(), notebook);
+    emit notebookAdded(notebook->guid());
+}
+
+void NotesStore::expungeNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error expunging notebook:" << errorMessage;
+        return;
+    }
+    emit notebookRemoved(guid);
+    Notebook *notebook = m_notebooksHash.take(guid);
+    m_notebooks.removeAll(notebook);
+    notebook->deleteLater();
+}
 
=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/notesstore.h	2013-12-14 00:07:45 +0000
@@ -1,53 +1,67 @@
 #ifndef NOTESSTORE_H
 #define NOTESSTORE_H
 
+#include "evernoteconnection.h"
+
+// Thrift
+#include <arpa/inet.h> // seems thrift forgot this one
+#include <protocol/TBinaryProtocol.h>
+#include <transport/THttpClient.h>
+#include <transport/TSSLSocket.h>
+#include <Thrift.h>
+
 // Evernote SDK
 #include <NoteStore.h>
 #include <NoteStore_constants.h>
 #include <Errors_types.h>
 
-#include <QObject>
+#include <QAbstractListModel>
 #include <QHash>
 
-class EvernoteJob;
-
 class Notebook;
 class Note;
 
-class NotesStore : public QObject
+using namespace apache::thrift::transport;
+
+class NotesStore : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
-
-    friend class EvernoteJob;
 
 public:
-    enum ErrorCode {
-        ErrorCodeNoError,
-        ErrorCodeUserException,
-        ErrorCodeSystemException,
-        ErrorCodeNotFoundExcpetion,
-        ErrorCodeConnectionLost
+    enum Roles {
+        RoleGuid,
+        RoleNotebookGuid,
+        RoleCreated,
+        RoleTitle,
+        RoleReminder,
+        RoleReminderTime,
+        RoleReminderDone,
+        RoleReminderDoneTime,
+        RoleIsSearchResult
     };
 
-    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
-
+    ~NotesStore();
     static NotesStore *instance();
-    static QString errorCodeToString(ErrorCode errorCode);
-
-    ~NotesStore();
-
-    QString token() const;
-    void setToken(const QString &token);
+
+    // reimplemented from QAbstractListModel
+    int rowCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QHash<int, QByteArray> roleNames() const;
 
     QList<Note*> notes() const;
-    Note* note(const QString &guid);
-    void saveNote(const QString &guid);
-    void deleteNote(const QString &guid);
+
+    Q_INVOKABLE Note* note(const QString &guid);
+    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
+    Q_INVOKABLE void saveNote(const QString &guid);
+    Q_INVOKABLE void deleteNote(const QString &guid);
+    Q_INVOKABLE void findNotes(const QString &searchWords);
 
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);
+    Q_INVOKABLE void createNotebook(const QString &name);
+    Q_INVOKABLE void expungeNotebook(const QString &guid);
 
+public slots:
     void refreshNotes(const QString &filterNotebookGuid = QString());
     void refreshNoteContent(const QString &guid);
     void refreshNotebooks();
@@ -61,30 +75,28 @@
 
     void notebookAdded(const QString &guid);
     void notebookChanged(const QString &guid);
+    void notebookRemoved(const QString &guid);
 
 private slots:
-    void fetchNotesJobDone(ErrorCode errorCode, const evernote::edam::NotesMetadataList &results);
-    void fetchNotebooksJobDone(ErrorCode errorCode, const std::vector<evernote::edam::Notebook> &results);
-    void fetchNoteJobDone(ErrorCode errorCode, const evernote::edam::Note &result);
-    void createNoteJobDone(ErrorCode errorCode, Note *note);
-    void saveNoteJobDone(ErrorCode errorCode, Note *note);
-    void deleteNoteJobDone(ErrorCode errorCode, const QString &guid);
-
-    void startJobQueue();
-    void startNextJob();
+    void fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
+    void fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
+    void fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
+    void createNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result);
+    void expungeNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
 
 private:
     explicit NotesStore(QObject *parent = 0);
     static NotesStore *s_instance;
 
-    QString m_token;
-    evernote::edam::NoteStoreClient *m_client;
-
-    QHash<QString, Notebook*> m_notebooks;
-    QHash<QString, Note*> m_notes;
-
-    QList<EvernoteJob*> m_jobQueue;
-    QThread *m_currentJob;
+    QList<Note*> m_notes;
+    QList<Notebook*> m_notebooks;
+
+    // Keep hashes for faster lookups as we always identify notes via guid
+    QHash<QString, Note*> m_notesHash;
+    QHash<QString, Notebook*> m_notebooksHash;
 };
 
 #endif // NOTESSTORE_H
 
=== modified file 'src/plugin/Evernote/userstore.cpp'
--- src/plugin/Evernote/userstore.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/userstore.cpp	2013-12-14 00:07:45 +0000
@@ -19,6 +19,8 @@
  */
 
 #include "userstore.h"
+#include "evernoteconnection.h"
+#include "jobs/fetchusernamejob.h"
 
 // Evernote sdk
 #include <UserStore.h>
@@ -34,106 +36,47 @@
 
 #include <QDebug>
 
-using namespace evernote::edam;
 using namespace apache::thrift;
 using namespace apache::thrift::protocol;
 using namespace apache::thrift::transport;
 
+UserStore* UserStore::s_instance = 0;
+
 UserStore::UserStore(QObject *parent) :
     QObject(parent)
 {
-
-    try {
-        // FIXME: need to populate this string from the system
-        // The structure should be:
-        // application/version; platform/version; [ device/version ]
-        // E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
-        QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
-        QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
-        QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/user");
-        boost::shared_ptr<TSocket> socket;
-        bool use_SSL = false;
-
-        if (use_SSL) {
-            // Create an SSL socket
-            // FIXME: this fails with the following error:
-            //   Thrift: Fri Nov 15 12:47:31 2013 SSL_shutdown: error code: 0
-            //   SSL_get_verify_result(), unable to get local issuer certificate
-            // Additionally, the UI blocks and does not load for about 2 minutes
-            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
-            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
-        } else {
-            // Create a non-secure socket
-            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
-        }
-
-        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
-        boost::shared_ptr<THttpClient> userStoreHttpClient (new THttpClient(bufferedTransport,
-                                                                            EVERNOTE_HOST.toStdString(),
-                                                                            EDAM_USER_STORE_PATH.toStdString()));
-        userStoreHttpClient->open();
-
-        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(userStoreHttpClient));
-        UserStoreClient m_client(iprot);
-        UserStoreConstants constants;
-
-        // checkVersion returns true if the client is capable of talking to the service,
-        // false otherwise
-        qDebug() << "version check:" << m_client.checkVersion(EDAM_CLIENT_NAME.toStdString(),
-                                                              constants.EDAM_VERSION_MAJOR,
-                                                              constants.EDAM_VERSION_MINOR);
-
-    } catch(...) {
-        displayException();
-    }
-}
-
-void UserStore::getPublicUserInfo(const QString &user)
-{
-    qDebug() << "should get public user info for user" << user;
-    //    PublicUserInfo userInfo;
-
-}
-
-// TODO: move to a common place instead of copying it through *store.cpps
-void UserStore::displayException()
-{
-    QString error_message = "Unknown Exception";
-    try
-    {
-        // this function is meant to be called from a catch block
-        // rethrow the exception to catch it again
-        throw;
-    }
-    catch (const EDAMNotFoundException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const EDAMSystemException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const EDAMUserException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const TTransportException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const TException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const std::exception & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (...)
-    {
-        error_message = "Tried to sync, but something went wrong.\n Unknown exception.";
-    }
-
-    qDebug() << error_message;
-    disconnect();
+    connect(EvernoteConnection::instance(), &EvernoteConnection::tokenChanged, this, &UserStore::fetchUsername);
+
+    fetchUsername();
+}
+
+UserStore *UserStore::instance()
+{
+    if (!s_instance) {
+        s_instance = new UserStore();
+    }
+    return s_instance;
+}
+
+QString UserStore::username() const
+{
+    return m_username;
+}
+
+void UserStore::fetchUsername()
+{
+    FetchUsernameJob *job = new FetchUsernameJob();
+    connect(job, &FetchUsernameJob::jobDone, this, &UserStore::fetchUsernameJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void UserStore::fetchUsernameJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error fetching username:" << errorMessage;
+        return;
+    }
+
+    m_username = result;
+    emit usernameChanged();
 }
 
=== modified file 'src/plugin/Evernote/userstore.h'
--- src/plugin/Evernote/userstore.h	2013-11-24 17:03:28 +0000
+++ src/plugin/Evernote/userstore.h	2013-12-14 00:07:45 +0000
@@ -1,6 +1,9 @@
 #ifndef USERSTORE_H
 #define USERSTORE_H
 
+#include "evernoteconnection.h"
+
+//Evernote SDK
 #include "UserStore.h"
 
 #include <QObject>
@@ -8,17 +11,28 @@
 class UserStore : public QObject
 {
     Q_OBJECT
+
+    // TODO: Once we need more than just the username, turn this into a class User
+    Q_PROPERTY(QString username READ username NOTIFY usernameChanged)
+
 public:
-    explicit UserStore(QObject *parent = 0);
+    static UserStore* instance();
+
+    QString username() const;
 
 signals:
-
-public slots:
-    void getPublicUserInfo(const QString &user);
+    void usernameChanged();
+
+private slots:
+    void fetchUsername();
+
+    void fetchUsernameJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result);
 
 private:
+    static UserStore* s_instance;
+    explicit UserStore(QObject *parent = 0);
 
-    void displayException();
+    QString m_username;
 };
 
 #endif // USERSTORE_H
 
=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.cpp'
--- src/plugin/Evernote/utils/html2enmlconverter.cpp	2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.cpp	2013-12-14 00:07:45 +0000
@@ -82,3 +82,25 @@
 
     return evml;
 }
+
+QString Html2EnmlConverter::enml2plaintext(const QString &enml)
+{
+    // output
+    QString plaintext;
+
+    // input
+    QXmlStreamReader reader(enml);
+
+    while (!reader.atEnd() && !reader.hasError()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+
+        // Write all normal text inside <body> </body> to output
+        if (token == QXmlStreamReader::Characters) {
+            plaintext.append(reader.text().toString());
+            plaintext.append(' ');
+        }
+    }
+
+    plaintext.remove('\n');
+    return plaintext;
+}
 
=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.h'
--- src/plugin/Evernote/utils/html2enmlconverter.h	2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.h	2013-12-14 00:07:45 +0000
@@ -9,6 +9,8 @@
     Html2EnmlConverter();
 
     static QString html2enml(const QString &html);
+
+    static QString enml2plaintext(const QString &enml);
 };
 
 #endif // HTML2ENMLCONVERTER_H