diff --git a/editor/editor_notes.cpp b/editor/editor_notes.cpp
index 96cc830d54..fedad26ffe 100644
--- a/editor/editor_notes.cpp
+++ b/editor/editor_notes.cpp
@@ -4,11 +4,15 @@
 
 #include "coding/internal/file_data.hpp"
 
+#include "geometry/mercator.hpp"
+
 #include "base/string_utils.hpp"
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 #include "base/timer.hpp"
 
+#include "std/future.hpp"
+
 #include "3party/pugixml/src/pugixml.hpp"
 
 namespace
@@ -58,10 +62,21 @@ void SaveToXml(vector<editor::Note> const & notes,
     node.append_attribute("text") = note.m_note.data();
   }
 }
+
+vector<editor::Note> MoveNoteVectorAtomicly(vector<editor::Note> && notes, mutex & mu)
+{
+  lock_guard<mutex> g(mu);
+  return move(notes);
+}
 }  // namespace
 
 namespace editor
 {
+shared_ptr<Notes> Notes::MakeNotes(string const & fileName)
+{
+  return shared_ptr<Notes>(new Notes(fileName));
+}
+
 Notes::Notes(string const & fileName)
     : m_fileName(fileName)
 {
@@ -75,9 +90,44 @@ void Notes::CreateNote(m2::PointD const & point, string const & text)
   Save();
 }
 
-void Notes::Upload()
+void Notes::Upload(osm::OsmOAuth const & auth)
 {
-  throw "NotImplemented";
+  auto const launch = [this, &auth]()
+  {
+    // Capture self to keep it from destruction until this thread is done.
+    auto const self = shared_from_this();
+    return async(launch::async,
+                 [self, auth]()
+                 {
+                   auto const notes = MoveNoteVectorAtomicly(move(self->m_notes),
+                                                             self->m_mu);
+
+                   vector<Note> unuploaded;
+                   osm::ServerApi06 api(auth);
+                   for (auto const & note : notes)
+                   {
+                     try
+                     {
+                       api.CreateNote(MercatorBounds::ToLatLon(note.m_point), note.m_note);
+                       ++self->m_uploadedNotes;
+                     }
+                     catch (osm::ServerApi06::ServerApi06Exception const & e)
+                     {
+                       LOG(LERROR, ("Can't upload note.", e.Msg()));
+                       unuploaded.push_back(note);
+                     }
+                   }
+
+                   lock_guard<mutex> g(self->m_mu);
+                   self->m_notes.insert(end(self->m_notes), begin(unuploaded), end(unuploaded));
+                 });
+  };
+
+  // Do not run more than one upload thread at a time.
+  static auto future = launch();
+  auto const status = future.wait_for(milliseconds(0));
+  if (status == future_status::ready)
+    future = launch();
 }
 
 bool Notes::Load()
diff --git a/editor/editor_notes.hpp b/editor/editor_notes.hpp
index 43d12c3430..6d38a32744 100644
--- a/editor/editor_notes.hpp
+++ b/editor/editor_notes.hpp
@@ -2,7 +2,10 @@
 
 #include "geometry/point2d.hpp"
 
+#include "editor/server_api.hpp"
+
 #include "std/mutex.hpp"
+#include "std/shared_ptr.hpp"
 #include "std/string.hpp"
 #include "std/vector.hpp"
 
@@ -25,20 +28,24 @@ inline bool operator==(Note const & a, Note const & b)
   return a.m_point == b.m_point && b.m_note == b.m_note;
 }
 
-class Notes
+class Notes : public enable_shared_from_this<Notes>
 {
 public:
-  Notes(string const & fileName);
+  static shared_ptr<Notes> MakeNotes(string const & fileName);
 
   void CreateNote(m2::PointD const & point, string const & text);
-  void Upload();
 
-  vector<Note> GetNotes() const { return m_notes; }
+  /// Uploads notes to the server in a separate thread.
+  void Upload(osm::OsmOAuth const & auth);
+
+  vector<Note> const & GetNotes() const { return m_notes; }
 
   uint32_t UnuploadedNotesCount() const { return m_notes.size(); }
   uint32_t UploadedNotesCount() const { return m_uploadedNotes; }
 
 private:
+  Notes(string const & fileName);
+
   bool Load();
   bool Save();
 
diff --git a/editor/editor_tests/editor_notes_test.cpp b/editor/editor_tests/editor_notes_test.cpp
index ee493e6a7c..a2e4ad6736 100644
--- a/editor/editor_tests/editor_notes_test.cpp
+++ b/editor/editor_tests/editor_notes_test.cpp
@@ -21,14 +21,14 @@ UNIT_TEST(Notes)
                                                 fileName});
   platform::tests_support::ScopedFile sf(fileName);
   {
-    Notes notes(fullFileName);
-    notes.CreateNote({1, 2}, "Some note1");
-    notes.CreateNote({2, 2}, "Some note2");
-    notes.CreateNote({1, 1}, "Some note3");
+    auto const notes = Notes::MakeNotes(fullFileName);
+    notes->CreateNote({1, 2}, "Some note1");
+    notes->CreateNote({2, 2}, "Some note2");
+    notes->CreateNote({1, 1}, "Some note3");
   }
   {
-    Notes notes(fullFileName);
-    auto const result = notes.GetNotes();
+    auto const notes = Notes::MakeNotes(fullFileName);
+    auto const result = notes->GetNotes();
     TEST_EQUAL(result.size(), 3, ());
     TEST_EQUAL(result,
                (vector<Note>{
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index cd032e2b36..bcb062d63e 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -48,6 +48,8 @@ using editor::XMLFeature;
 namespace
 {
 constexpr char const * kEditorXMLFileName = "edits.xml";
+// TODO(mgsergio): Hide in notes.
+constexpr char const * kNotesXMLFileName = "notes.xml";
 constexpr char const * kXmlRootNode = "mapsme";
 constexpr char const * kXmlMwmNode = "mwm";
 constexpr char const * kDeleteSection = "delete";
@@ -66,6 +68,7 @@ bool NeedsUpload(string const & uploadStatus)
 }
 
 string GetEditorFilePath() { return GetPlatform().WritablePathForFile(kEditorXMLFileName); }
+string GetNotesFilePath() { return GetPlatform().WritablePathForFile(kNotesXMLFileName); }
 
 /// Compares editable fields connected with feature ignoring street.
 bool AreFeaturesEqualButStreet(FeatureType const & a, FeatureType const & b)
@@ -128,6 +131,11 @@ namespace osm
 // TODO(AlexZ): Normalize osm multivalue strings for correct merging
 // (e.g. insert/remove spaces after ';' delimeter);
 
+Editor::Editor()
+    : m_notes(editor::Notes::MakeNotes(GetNotesFilePath()))
+{
+}
+
 Editor & Editor::Instance()
 {
   static Editor instance;
@@ -767,6 +775,16 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::Mwm
   return true;
 }
 
+void Editor::CreateNote(m2::PointD const & point, string const & note)
+{
+  m_notes->CreateNote(point, note);
+}
+
+void Editor::UploadNotes(string const & key, string const & secret)
+{
+  m_notes->Upload(OsmOAuth::ServerAuth({key, secret}));
+}
+
 string DebugPrint(Editor::FeatureStatus fs)
 {
   switch (fs)
diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index b8cb174711..4c8e53fe37 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -8,6 +8,7 @@
 #include "indexer/mwm_set.hpp"
 
 #include "editor/editor_config.hpp"
+#include "editor/editor_notes.hpp"
 #include "editor/new_feature_categories.hpp"
 #include "editor/xml_feature.hpp"
 
@@ -23,7 +24,7 @@ namespace osm
 {
 class Editor final
 {
-  Editor() = default;
+  Editor();
 
 public:
   using TFeatureTypeFn = function<void(FeatureType &)>;  // Mimics Framework::TFeatureTypeFn.
@@ -114,6 +115,9 @@ public:
 
   bool CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::MwmId const & id, EditableMapObject & outFeature);
 
+  void CreateNote(m2::PointD const & point, string const & note);
+  void UploadNotes(string const & key, string const & secret);
+
   struct Stats
   {
     /// <id, feature status string>
@@ -166,6 +170,9 @@ private:
 
   /// Contains information about what and how can be edited.
   editor::EditorConfig m_config;
+
+  /// Notes to be sent to osm.
+  shared_ptr<editor::Notes> m_notes;
 };  // class Editor
 
 string DebugPrint(Editor::FeatureStatus fs);
diff --git a/std/shared_ptr.hpp b/std/shared_ptr.hpp
index 8bdab56417..2ac9c7ad0a 100644
--- a/std/shared_ptr.hpp
+++ b/std/shared_ptr.hpp
@@ -7,6 +7,7 @@
 #include <memory>
 using std::shared_ptr;
 using std::make_shared;
+using std::enable_shared_from_this;
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW