diff -r 34a75bd8d0b9 -r d48946d164c6 client/src/reducers/notesReducer.js
--- a/client/src/reducers/notesReducer.js	Tue Jul 25 19:11:26 2017 +0200
+++ b/client/src/reducers/notesReducer.js	Fri Jul 28 19:40:35 2017 +0200
@@ -1,6 +1,7 @@
 import Immutable from 'immutable';
 import * as types from '../constants/actionTypes';
 import NoteRecord from '../store/noteRecord';
+import { ActionEnum } from '../constants';
 
 const findNoteIndex = (notes, id) => {
   return notes.findIndex((note) => note.get('_id') === id);
@@ -18,28 +19,68 @@
     case types.DELETE_NOTE: {
       const noteIndex = findNoteIndex(state, action.note.get('_id'));
       const note = findNote(state, action.note.get('_id'));
-      return state.set(noteIndex, note.merge({deleted:true, modified:true}));
+      return state.set(noteIndex, note.merge({action: ActionEnum.DELETED}));
     }
     case types.DO_DELETE_NOTE: {
-      const noteIndex = state.findIndex((note) => note.get('_id') === action.note.get('_id'));
+      const noteIndex = state.findIndex((note) => note.get('_id') === action.noteId);
       return state.delete(noteIndex);
     }
     case types.UPDATE_NOTE: {
       const index = findNoteIndex(state, action.note.get('_id'));
       const note = findNote(state, action.note.get('_id'));
-      let newNote = note.merge(action.data, {modified:true});
+      let newAction;
+      switch (note.get('action')) {
+        case ActionEnum.CREATED:
+          newAction = ActionEnum.CREATED;
+          break;
+        case ActionEnum.DELETED: // should not happen, but...
+          newAction = ActionEnum.DELETED;
+          break;
+        default:
+          newAction = ActionEnum.UPDATED;
+      }
+
+      let newNote = note.merge(action.data, {action: newAction});
       return state.set(index, newNote);
     }
     case types.DELETE_SESSION: {
       const sessionId = action.session.get('_id');
       return state.map((note) => {
         if(sessionId === note.session) {
-          return note.merge({deleted:true, modified:true});
+          return note.merge({action: ActionEnum.DELETED});
         } else {
           return note;
         }
       })
     }
+    case types.DO_DELETE_SESSION: {
+      return state.filter((note) => action.sessionId !== note.session)
+    }
+    case types.RESET_ACTION_NOTE: {
+      const noteId = action.note.get('_id');
+      const index = state.findIndex((note) => note.get('_id') === noteId);
+      const note = state.get(index);
+      return state.set(index, note.merge({action: ActionEnum.NONE}));
+    }
+    case types.SYNC_RESET_ALL: {
+      return state.map((note) => {
+        if(note.action !== ActionEnum.NONE) {
+          return note.merge({action: ActionEnum.None});
+        } else {
+          return note;
+        }
+      });
+    }
+    case types.LOAD_NOTE: {
+      const noteRec = action.note;
+      const noteId = noteRec.get('_id');
+      const index = state.findIndex((note) => note.get('_id') === noteId);
+      if(index >= 0) {
+        return state.set(index, noteRec);
+      } else {
+        return state.push(noteRec);
+      }
+    }
     default:
       return state;
   }