diff --git a/ReactNativeClient/lib/models/note.js b/ReactNativeClient/lib/models/note.js
index dfec2df7bb..483e6995f1 100644
--- a/ReactNativeClient/lib/models/note.js
+++ b/ReactNativeClient/lib/models/note.js
@@ -227,6 +227,8 @@ class Note extends BaseItem {
 		if (isNew && !o.source) o.source = Setting.value('appName');
 		if (isNew && !o.source_application) o.source_application = Setting.value('appId');
 
+		//return super.save(o, options);
+
 		return super.save(o, options).then((result) => {
 			// 'result' could be a partial one at this point (if, for example, only one property of it was saved)
 			// so call this.preview() so that the right fields are populated.
diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js
index 07d2c3a7ae..6749a2c46f 100644
--- a/ReactNativeClient/root.js
+++ b/ReactNativeClient/root.js
@@ -197,7 +197,7 @@ const reducer = (state = defaultState, action) => {
 				for (let i = 0; i < newFolders.length; i++) {
 					let n = newFolders[i];
 					if (n.id == action.folder.id) {
-						newFolders[i] = action.folder;
+						newFolders[i] = Object.assign(newFolders[i], action.folder);
 						found = true;
 						break;
 					}