diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 4126e580..4917db3b 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -70,7 +70,9 @@ export default class CodeEditor extends React.Component {
         storageKey,
         noteKey
       } = this.props
-      debouncedDeletionOfAttachments(this.editor.getValue(), storageKey, noteKey)
+      if (this.props.deleteUnusedAttachments === true) {
+        debouncedDeletionOfAttachments(this.editor.getValue(), storageKey, noteKey)
+      }
     }
     this.pasteHandler = (editor, e) => {
       e.preventDefault()
@@ -632,6 +634,9 @@ export default class CodeEditor extends React.Component {
         this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
       }
     }
+    if (prevProps.deleteUnusedAttachments !== this.props.deleteUnusedAttachments) {
+      this.editor.setOption('deleteUnusedAttachments', this.props.deleteUnusedAttachments)
+    }
 
     if (needRefresh) {
       this.editor.refresh()
@@ -1204,7 +1209,8 @@ CodeEditor.propTypes = {
   autoDetect: PropTypes.bool,
   spellCheck: PropTypes.bool,
   enableMarkdownLint: PropTypes.bool,
-  customMarkdownLintConfig: PropTypes.string
+  customMarkdownLintConfig: PropTypes.string,
+  deleteUnusedAttachments: PropTypes.bool
 }
 
 CodeEditor.defaultProps = {
@@ -1219,5 +1225,6 @@ CodeEditor.defaultProps = {
   spellCheck: false,
   enableMarkdownLint: DEFAULT_CONFIG.editor.enableMarkdownLint,
   customMarkdownLintConfig: DEFAULT_CONFIG.editor.customMarkdownLintConfig,
-  prettierConfig: DEFAULT_CONFIG.editor.prettierConfig
+  prettierConfig: DEFAULT_CONFIG.editor.prettierConfig,
+  deleteUnusedAttachments: DEFAULT_CONFIG.editor.deleteUnusedAttachments
 }
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index c38aa99b..cd885fd9 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -324,6 +324,7 @@ class MarkdownEditor extends React.Component {
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
           prettierConfig={config.editor.prettierConfig}
+          deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
         />
         <MarkdownPreview styleName={this.state.status === 'PREVIEW'
             ? 'preview'
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 56f6ef8f..f5996c59 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -182,6 +182,7 @@ class MarkdownSplitEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
+          deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
        />
         <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
           <div styleName='slider-hitbox' />
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 7fba00d8..b753c515 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -75,8 +75,8 @@ export const DEFAULT_CONFIG = {
       "tabWidth": 4,
       "semi": false,
       "singleQuote": true
-  }`
-
+    }`,
+    deleteUnusedAttachments: true
   },
   preview: {
     fontSize: '14',
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 9014de42..329dbfa4 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -111,8 +111,8 @@ class UiTab extends React.Component {
         enableSmartPaste: this.refs.enableSmartPaste.checked,
         enableMarkdownLint: this.refs.enableMarkdownLint.checked,
         customMarkdownLintConfig: this.customMarkdownLintConfigCM.getCodeMirror().getValue(),
-        prettierConfig: this.prettierConfigCM.getCodeMirror().getValue()
-
+        prettierConfig: this.prettierConfigCM.getCodeMirror().getValue(),
+        deleteUnusedAttachments: this.refs.deleteUnusedAttachments.checked
       },
       preview: {
         fontSize: this.refs.previewFontSize.value,
@@ -618,6 +618,16 @@ class UiTab extends React.Component {
               {i18n.__('Enable spellcheck - Experimental feature!! :)')}
             </label>
           </div>
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.deleteUnusedAttachments}
+                ref='deleteUnusedAttachments'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Delete attachments, that are not referenced in the text anymore')}
+            </label>
+          </div>
 
           <div styleName='group-section'>
             <div styleName='group-section-label'>