diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 71c32fceae..28b26d7127 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -132,16 +132,22 @@
    "message": "the file name of the bookmarks file that will reside in your Google Drive (make sure this name is unique in your Drive)"
  },
   "LabelServerfolder": {
-    "message": "Server folder"
+    "message": "Server target"
   },
   "DescriptionServerfolder": {
-    "message": "This is the path prefix under which this account will operate on the server. Leave this empty to use no prefix at all."
+    "message": "When syncing, your bookmarks in this browser will be stored as links under this path on the server. Note, that this path represents a folder in the Nextcloud Bookmarks app, not a folder in Nextcloud Files. Leave this empty to just put all links in the topmost folder on the server."
+  },
+  "LabelLocaltarget": {
+    "message": "Local target"
+  },
+  "DescriptionLocaltarget": {
+    "message": "Choose here, whether you want to sync browser bookmarks, or browser tabs."
   },
   "LabelLocalfolder": {
-    "message": "Local folder"
+    "message": "Bookmarks folder"
   },
   "DescriptionLocalfolder": {
-    "message": "This is the local bookmarks folder in this browser that will be synced to the server. Note that some browser don't allow creating new items under the root folder (e.g. Firefox and Google Chrome)"
+    "message": "Bookmarks in this bookmarks folder will be stored as links on the server and links on the server will be stored as bookmarks in this bookmarks folder in this browser."
   },
   "LabelRootfolder": {
     "message": "Root folder"
@@ -418,7 +424,10 @@
     "message": "Folder not found"
   },
   "LabelSyncTabs": {
-    "message": "Sync Tabs"
+    "message": "Browser tabs"
+  },
+  "DescriptionSyncTabs": {
+    "message": "Links that are stored on the server will be opened as browser tabs in your browser and existing open browser tabs are stored as links on your server. Note that depending how many links are stored on the server, since they will all be opened as tabs on the next sync run, this may possibly overwhelm your browser."
   },
   "LabelTabs": {
     "message": "Tabs"
diff --git a/src/ui/components/OptionSyncFolder.vue b/src/ui/components/OptionSyncFolder.vue
index c86b2c72e0..3c5a445b14 100644
--- a/src/ui/components/OptionSyncFolder.vue
+++ b/src/ui/components/OptionSyncFolder.vue
@@ -2,10 +2,7 @@
   <div>
     <div>
       <div class="text-h6">
-        {{ t('LabelLocalfolder') }}
-      </div>
-      <div class="caption">
-        {{ t('DescriptionLocalfolder') }}
+        {{ t('LabelLocaltarget') }}
       </div>
       <v-radio-group
         v-model="mode"
@@ -13,8 +10,8 @@
         <v-radio value="folder">
           <template #label>
             {{ t('LabelLocalfolder') }}
-            &nbsp;
             <v-text-field
+                class="ml-2"
               v-model="path"
               readonly
               @click="onTriggerFinder">
@@ -28,9 +25,15 @@
             </v-text-field>
           </template>
         </v-radio>
+        <div class="caption ml-8 mb-6">
+          {{ t('DescriptionLocalfolder') }}
+        </div>
         <v-radio
           :label="t('LabelSyncTabs')"
           value="tabs" />
+        <div class="caption ml-8 mb-2">
+          {{ t('DescriptionSyncTabs') }}
+        </div>
       </v-radio-group>
     </div>
     <v-dialog