2 files changed, 8 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index f58c11b..f0d2038 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -69,2 +69,3 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	correctionEnabled_ = Maybe;
+	fileTransferEnabled_ = Maybe;
 	updateTitleWithUnreadCount();
@@ -388,2 +389,6 @@ void QtChatWindow::setCorrectionEnabled(Tristate enabled) {
 
+void QtChatWindow::setFileTransferEnabled(Tristate enabled) {
+	fileTransferEnabled_ = enabled;
+}
+
 SecurityLabelsCatalog::Item QtChatWindow::getSelectedSecurityLabel() {
@@ -552,3 +557,3 @@ void QtChatWindow::dragEnterEvent(QDragEnterEvent *event) {
 void QtChatWindow::dropEvent(QDropEvent *event) {
-	if (event->mimeData()->hasUrls()) {
+	if (fileTransferEnabled_ == ChatWindow::Yes && event->mimeData()->hasUrls()) {
 		if (event->mimeData()->urls().size() == 1) {
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index de7e45e..95edcd0 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -138,2 +138,3 @@ namespace Swift {
 			void setCorrectionEnabled(Tristate enabled);
+			void setFileTransferEnabled(Tristate enabled);
 
@@ -205,2 +206,3 @@ namespace Swift {
 			Tristate correctionEnabled_;
+			Tristate fileTransferEnabled_;
 			QString alertStyleSheet_;