Merge branch 'develop' into main

# Conflicts:
#	README.md
#	docs/quick-start.md

1 files changed, 0 insertions, 22 deletions

diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 0f7f1040..21f6e3b7 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -447,26 +447,4 @@ void MainWindow::createDockWindows() {
     infoBoardDock->setWidget(infoBoard);
     infoBoardDock->widget()->layout()->setContentsMargins(0, 0, 0, 0);
     viewMenu->addAction(infoBoardDock->toggleViewAction());
-
-    /* Attachments-Dockwindow
-      */
-    if (settings.value("mime/parseMime").toBool()) {
-        createAttachmentDock();
-    }
-}
-
-void MainWindow::createAttachmentDock() {
-    if (attachmentDockCreated) {
-        return;
-    }
-    mAttachments = new Attachments();
-    attachmentDock = new QDockWidget(tr("Attached files:"), this);
-    attachmentDock->setObjectName("AttachmentDock");
-    attachmentDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
-    addDockWidget(Qt::LeftDockWidgetArea, attachmentDock);
-    attachmentDock->setWidget(mAttachments);
-    // hide till attachment is decrypted
-    viewMenu->addAction(attachmentDock->toggleViewAction());
-    attachmentDock->hide();
-    attachmentDockCreated = true;
 }