diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
index 5e1d86a84..d76fd9a2a 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
@@ -173,6 +173,10 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
     private static final String NODE_FILES_DOWNLOAD_LIMIT = "downloadlimit";
     private static final String FILES_DOWNLOAD_LIMIT_DEFAULT = "default-limit";
 
+    // notes folder location
+    private static final String NODE_NOTES = "notes";
+    private static final String NOTES_PATH = "notes_path";
+
     private OCCapability currentCapability = null;
 
     public GetCapabilitiesRemoteOperation() {
@@ -770,6 +774,22 @@ private OCCapability parseResponse(String response) throws JSONException {
                 } else {
                     capability.setRecommendations(CapabilityBooleanType.FALSE);
                 }
+
+                // notes folder
+                if (respCapabilities.has(NODE_NOTES)) {
+                    JSONObject notesCapability = respCapabilities.getJSONObject(NODE_NOTES);
+
+                    if (notesCapability.has(NOTES_PATH)) {
+                        String notesFolderPath = notesCapability.getString(NOTES_PATH);
+
+                        if (!notesFolderPath.isEmpty() && !notesFolderPath.endsWith("/")) {
+                            notesFolderPath += "/";
+                        }
+
+                        capability.setNotesFolderPath(notesFolderPath);
+                    }
+                }
+
             }
 
             Log_OC.d(TAG, "*** Get Capabilities completed ");
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
index b3873d686..0e5e7c52b 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
@@ -117,6 +117,9 @@ class OCCapability {
     var filesDownloadLimit = CapabilityBooleanType.UNKNOWN
     var filesDownloadLimitDefault = -1
 
+    // notes folder location
+    var notesFolderPath: String? = null
+
     // Etag for capabilities
     var etag: String? = ""