diff --git a/Lang/imageuploader.pot b/Lang/imageuploader.pot
index 10a0be3c..d975b5b4 100644
--- a/Lang/imageuploader.pot
+++ b/Lang/imageuploader.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: imageuploader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-28 18:37+0300\n"
+"POT-Creation-Date: 2024-02-10 15:22+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,8 +94,8 @@ msgstr ""
 
 #: ../Source/Gui/Dialogs/LogoSettings.cpp:382
 #: ../Source/Gui/Dialogs/LogoSettings.cpp:383
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1273
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1274
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1286
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1287
 msgid "(edited)"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "About Image Uploader"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2265
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2272
 msgid "About..."
 msgstr ""
 
@@ -277,8 +277,8 @@ msgstr ""
 #: ../Source/Gui/Dialogs/MainDlg.cpp:673
 #: ../Source/Gui/Dialogs/UploadSettingsPage.cpp:227
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:384
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1619
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1813
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1621
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1815
 #: ../Source/ImageEditor/Gui/ImageEditorWindow.cpp:1335
 msgid "All files"
 msgstr ""
@@ -321,7 +321,7 @@ msgid "An error occured while receiving update information from server."
 msgstr ""
 
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:1408
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1841
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1843
 msgid "Any file"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Are you sure to place text and logo in the same position on image?"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1742
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1744
 msgid "Are you sure to quit?"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Audio"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1812
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1814
 msgid "Audio files"
 msgstr ""
 
@@ -528,7 +528,7 @@ msgid ""
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:499
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:192
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:193
 msgid "Capture Last Region"
 msgstr ""
 
@@ -547,6 +547,7 @@ msgstr ""
 msgid "Capture Selected Object"
 msgstr ""
 
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:192
 #: ../Source/Gui/Dialogs/ScreenshotDlg.cpp:50
 msgid "Capture Selected Window"
 msgstr ""
@@ -597,7 +598,7 @@ msgstr ""
 msgid "Change width:"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2267
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2274
 msgid "Check for Updates"
 msgstr ""
 
@@ -609,11 +610,11 @@ msgstr ""
 msgid "Choose executable file"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1843
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1845
 msgid "Choose files"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1719
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1721
 msgid "Choose folder"
 msgstr ""
 
@@ -621,7 +622,7 @@ msgstr ""
 msgid "Choose folder..."
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1816
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1818
 msgid "Choose media file"
 msgstr ""
 
@@ -633,8 +634,8 @@ msgstr ""
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:133
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:138
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:139
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1448
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1460
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1461
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1473
 msgid "Choose more servers..."
 msgstr ""
 
@@ -661,7 +662,7 @@ msgid "Choose servers"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:387
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1622
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1624
 msgid "Choose video file"
 msgstr ""
 
@@ -819,6 +820,11 @@ msgstr ""
 msgid "Copy e-mail"
 msgstr ""
 
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:297
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:956
+msgid "Copy folder's ID"
+msgstr ""
+
 #: ../Source/Gui/Dialogs/MainDlg.cpp:205
 msgid "Copy full path"
 msgstr ""
@@ -914,7 +920,7 @@ msgstr ""
 msgid "Create folder (album)"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:289
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:293
 msgid "Create nested folder"
 msgstr ""
 
@@ -1020,7 +1026,7 @@ msgstr ""
 msgid "Do nothing"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2266
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2273
 msgid "Documentation"
 msgstr ""
 
@@ -1029,7 +1035,7 @@ msgstr ""
 msgid "Don't have an account? Sign up on %s right now"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1089
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1102
 msgid "Don't resize"
 msgstr ""
 
@@ -1060,7 +1066,7 @@ msgid "Duration: "
 msgstr ""
 
 #: ../Source/Gui/Dialogs/MainDlg.cpp:190
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:277
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:281
 #: ../Source/Gui/Dialogs/ThumbSettingsPage.cpp:58
 msgid "Edit"
 msgstr ""
@@ -1193,9 +1199,9 @@ msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:211
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:584
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:204
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:205
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:382
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1732
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1734
 msgid "Exit"
 msgstr ""
 
@@ -1437,7 +1443,7 @@ msgid "Frames layout"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:504
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:193
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:194
 #: ../Source/Gui/Dialogs/ScreenshotDlg.cpp:49
 msgid "Freehand Capture"
 msgstr ""
@@ -1480,7 +1486,7 @@ msgstr ""
 msgid "Global hotkey:"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1032
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1045
 msgid "Go to signup page"
 msgstr ""
 
@@ -1515,7 +1521,7 @@ msgstr ""
 
 #: ../Source/Gui/Dialogs/LogWindow.cpp:160
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:384
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1734
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1736
 msgid "Hide"
 msgstr ""
 
@@ -1593,7 +1599,7 @@ msgstr ""
 #: ../Source/Gui/Dialogs/ResultsPanel.cpp:186
 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:57
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:1404
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1839
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1841
 msgid "Images"
 msgstr ""
 
@@ -1601,7 +1607,7 @@ msgstr ""
 msgid "Images editor:"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:198
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:199
 msgid "Images from web"
 msgstr ""
 
@@ -1631,7 +1637,7 @@ msgstr ""
 msgid "In queue"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1720
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1722
 msgid "Including subdirectories"
 msgstr ""
 
@@ -1847,7 +1853,7 @@ msgstr ""
 msgid "New Profile Name"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:954
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:949
 msgid "New folder"
 msgstr ""
 
@@ -1921,8 +1927,8 @@ msgid "Open download page"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/HistoryWindow.cpp:190
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:283
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:959
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:287
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:960
 msgid "Open in Web Browser"
 msgstr ""
 
@@ -1948,8 +1954,8 @@ msgid "Open screenshot in the editor"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:577
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:195
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2269
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:196
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2276
 msgid "Open screenshots folder"
 msgstr ""
 
@@ -1979,7 +1985,7 @@ msgid "Password:"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:488
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:197
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:198
 #: ../Source/Gui/Dialogs/MainDlg.cpp:158
 #: ../Source/ImageEditor/Gui/InputBoxControl.cpp:239
 msgid "Paste"
@@ -2118,7 +2124,7 @@ msgid "Queued"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:491
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:200
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:201
 msgid "Quick upload image from clipboard"
 msgstr ""
 
@@ -2190,7 +2196,7 @@ msgstr ""
 msgid "Reupload"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:203
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:204
 msgid "Reupload images"
 msgstr ""
 
@@ -2346,8 +2352,8 @@ msgid "Selected server: %s"
 msgstr ""
 
 #: ../Source/Gui/Controls/MultiServerSelectorControl.cpp:107
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1450
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:1463
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1476
 #, c-format
 msgid "Selected servers: %d"
 msgstr ""
@@ -2394,7 +2400,7 @@ msgstr ""
 msgid "Server not chosen"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1026
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1039
 msgid "Server settings"
 msgstr ""
 
@@ -2432,7 +2438,7 @@ msgstr ""
 
 #: ../Source/Core/Settings/WtlGuiSettings.cpp:183
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:582
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:196
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:197
 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:77
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:105
 msgid "Settings"
@@ -2468,7 +2474,7 @@ msgid "Shorten URL"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/ResultsPanel.cpp:893
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1201
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1214
 #, c-format
 msgid "Shorten URL using %s"
 msgstr ""
@@ -2478,12 +2484,12 @@ msgid "Shorten URLs"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:574
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:201
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:202
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:94
 msgid "Shorten a link"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:202
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:203
 msgid "Shorten a link from the clipboard"
 msgstr ""
 
@@ -2502,7 +2508,7 @@ msgstr ""
 
 #: ../Source/Gui/Dialogs/GeneralSettings.cpp:37
 #: ../Source/Gui/Dialogs/ImageReuploaderDlg.cpp:86
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2274
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2281
 msgid "Show Error Log"
 msgstr ""
 
@@ -2519,7 +2525,7 @@ msgid "Show log for this file"
 msgstr ""
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:576
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:194
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:195
 msgid "Show program's window"
 msgstr ""
 
@@ -2677,7 +2683,7 @@ msgstr ""
 msgid "This means that the thumbnail will be created by site, not the program."
 msgstr ""
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1047
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1060
 msgid "This server doesn't have any settings."
 msgstr ""
 
@@ -2772,7 +2778,7 @@ msgstr ""
 
 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:116
 #: ../Source/Gui/Dialogs/ShortenUrlDlg.cpp:86
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1115
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1128
 msgid "URL shortening server"
 msgstr ""
 
@@ -2785,7 +2791,7 @@ msgstr ""
 msgid "Unable to load picture"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2161
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2163
 msgid "Unable to make screenshot!"
 msgstr ""
 
@@ -2970,9 +2976,9 @@ msgid "Video engine which is used to extract frames from a video file."
 msgstr ""
 
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:383
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1618
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1811
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1840
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1620
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1813
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1842
 msgid "Video files"
 msgstr ""
 
@@ -2989,7 +2995,7 @@ msgstr ""
 msgid "View BBCode/HTML codes"
 msgstr ""
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:199
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:200
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:103
 msgid "View Media File Information"
 msgstr ""
diff --git a/Lang/locale/ru/LC_MESSAGES/imageuploader.po b/Lang/locale/ru/LC_MESSAGES/imageuploader.po
index 76a858de..9610f486 100644
--- a/Lang/locale/ru/LC_MESSAGES/imageuploader.po
+++ b/Lang/locale/ru/LC_MESSAGES/imageuploader.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: imageuploader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-28 18:37+0300\n"
-"PO-Revision-Date: 2024-01-28 18:38+0300\n"
+"POT-Creation-Date: 2024-02-10 15:22+0300\n"
+"PO-Revision-Date: 2024-02-10 15:25+0300\n"
 "Last-Translator: \n"
 "Language-Team: zenden2k@gmail.com\n"
 "Language: ru\n"
@@ -105,8 +105,8 @@ msgstr "&Загрузить"
 
 #: ../Source/Gui/Dialogs/LogoSettings.cpp:382
 #: ../Source/Gui/Dialogs/LogoSettings.cpp:383
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1273
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1274
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1286
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1287
 msgid "(edited)"
 msgstr "(изменен)"
 
@@ -132,7 +132,7 @@ msgstr "Доступна новая версия:"
 msgid "About Image Uploader"
 msgstr "О программе"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2265
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2272
 msgid "About..."
 msgstr "О программе..."
 
@@ -288,8 +288,8 @@ msgstr "Только для Aero (Windows Vista и новее)"
 #: ../Source/Gui/Dialogs/MainDlg.cpp:673
 #: ../Source/Gui/Dialogs/UploadSettingsPage.cpp:227
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:384
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1619
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1813
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1621
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1815
 #: ../Source/ImageEditor/Gui/ImageEditorWindow.cpp:1335
 msgid "All files"
 msgstr "Все файлы"
@@ -332,7 +332,7 @@ msgid "An error occured while receiving update information from server."
 msgstr "Ошибка при получении данных об обновлениях."
 
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:1408
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1841
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1843
 msgid "Any file"
 msgstr "Любые файлы"
 
@@ -352,7 +352,7 @@ msgstr ""
 "Вы действительно хотите поместить текст и логотип в одном месте на "
 "изображении?"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1742
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1744
 msgid "Are you sure to quit?"
 msgstr "Вы действительно хотите выйти из программы?"
 
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1812
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1814
 msgid "Audio files"
 msgstr "Аудио файлы"
 
@@ -549,7 +549,7 @@ msgstr ""
 " Возможно, оно занято другой программой."
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:499
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:192
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:193
 msgid "Capture Last Region"
 msgstr "Снимок последней области"
 
@@ -568,6 +568,7 @@ msgstr "Снимок выделенной области"
 msgid "Capture Selected Object"
 msgstr "Снимок выбранного элемента"
 
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:192
 #: ../Source/Gui/Dialogs/ScreenshotDlg.cpp:50
 msgid "Capture Selected Window"
 msgstr "Снимок выбранного окна"
@@ -620,7 +621,7 @@ msgstr ""
 msgid "Change width:"
 msgstr "Изменение ширины:"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2267
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2274
 msgid "Check for Updates"
 msgstr "Проверить обновления"
 
@@ -632,11 +633,11 @@ msgstr "Проверка обновлений..."
 msgid "Choose executable file"
 msgstr "Выберите исполняемый файл"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1843
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1845
 msgid "Choose files"
 msgstr "Выберите файлы"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1719
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1721
 msgid "Choose folder"
 msgstr "Выбор папки"
 
@@ -644,7 +645,7 @@ msgstr "Выбор папки"
 msgid "Choose folder..."
 msgstr "Выберите папку..."
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1816
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1818
 msgid "Choose media file"
 msgstr "Выберите медиафайл"
 
@@ -656,8 +657,8 @@ msgstr "Выберите монитор"
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:133
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:138
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:139
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1448
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1460
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1461
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1473
 msgid "Choose more servers..."
 msgstr "Выбрать больше серверов..."
 
@@ -684,7 +685,7 @@ msgid "Choose servers"
 msgstr "Выбрать серверы"
 
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:387
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1622
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1624
 msgid "Choose video file"
 msgstr "Выберите видеофайл"
 
@@ -842,6 +843,11 @@ msgstr "Автоматически копировать результаты в
 msgid "Copy e-mail"
 msgstr "Копировать e-mail"
 
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:297
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:956
+msgid "Copy folder's ID"
+msgstr "Копировать ID папки"
+
 #: ../Source/Gui/Dialogs/MainDlg.cpp:205
 msgid "Copy full path"
 msgstr "Копировать полный путь к файлу"
@@ -944,7 +950,7 @@ msgstr "Создать папку"
 msgid "Create folder (album)"
 msgstr "Новая папка (альбом)"
 
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:289
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:293
 msgid "Create nested folder"
 msgstr "Создать вложенную папку"
 
@@ -1050,7 +1056,7 @@ msgstr "Не запускать новые копии программы из т
 msgid "Do nothing"
 msgstr "Нет действия"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2266
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2273
 msgid "Documentation"
 msgstr "Документация"
 
@@ -1059,7 +1065,7 @@ msgstr "Документация"
 msgid "Don't have an account? Sign up on %s right now"
 msgstr "У вас нет учетной записи? Зарегистрируйтесь на %s прямо сейчас!"
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1089
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1102
 msgid "Don't resize"
 msgstr "Без изменения"
 
@@ -1091,7 +1097,7 @@ msgid "Duration: "
 msgstr "Длительность: "
 
 #: ../Source/Gui/Dialogs/MainDlg.cpp:190
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:277
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:281
 #: ../Source/Gui/Dialogs/ThumbSettingsPage.cpp:58
 msgid "Edit"
 msgstr "Редактировать"
@@ -1224,9 +1230,9 @@ msgstr "Выполнять Squirrel-скрипт для каждой задач
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:211
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:584
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:204
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:205
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:382
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1732
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1734
 msgid "Exit"
 msgstr "Выход"
 
@@ -1475,7 +1481,7 @@ msgid "Frames layout"
 msgstr "Параметры компоновки кадров в мозаику"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:504
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:193
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:194
 #: ../Source/Gui/Dialogs/ScreenshotDlg.cpp:49
 msgid "Freehand Capture"
 msgstr "Снимок произвольной формы"
@@ -1518,7 +1524,7 @@ msgstr "Глобальные"
 msgid "Global hotkey:"
 msgstr "Глобальная комбинация:"
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1032
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1045
 msgid "Go to signup page"
 msgstr "Открыть страницу регистрации"
 
@@ -1553,7 +1559,7 @@ msgstr "Помощь"
 
 #: ../Source/Gui/Dialogs/LogWindow.cpp:160
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:384
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1734
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1736
 msgid "Hide"
 msgstr "Скрыть"
 
@@ -1633,7 +1639,7 @@ msgstr "Параметры изображений"
 #: ../Source/Gui/Dialogs/ResultsPanel.cpp:186
 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:57
 #: ../Source/Gui/Dialogs/WizardDlg.cpp:1404
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1839
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1841
 msgid "Images"
 msgstr "Изображения"
 
@@ -1641,7 +1647,7 @@ msgstr "Изображения"
 msgid "Images editor:"
 msgstr "Графический редактор:"
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:198
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:199
 msgid "Images from web"
 msgstr "Изображения из Web"
 
@@ -1671,7 +1677,7 @@ msgstr "Импорт видео"
 msgid "In queue"
 msgstr "В очереди"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1720
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1722
 msgid "Including subdirectories"
 msgstr "Включая поддиректории"
 
@@ -1893,7 +1899,7 @@ msgstr "Название:"
 msgid "New Profile Name"
 msgstr "Имя нового профиля"
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:954
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:949
 msgid "New folder"
 msgstr "Новая папка"
 
@@ -1967,8 +1973,8 @@ msgid "Open download page"
 msgstr "Открыть страницу загрузки"
 
 #: ../Source/Gui/Dialogs/HistoryWindow.cpp:190
-#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:283
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:959
+#: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:287
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:960
 msgid "Open in Web Browser"
 msgstr "Открыть в браузере"
 
@@ -1994,8 +2000,8 @@ msgid "Open screenshot in the editor"
 msgstr "Открыть скриншот в редакторе"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:577
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:195
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2269
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:196
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2276
 msgid "Open screenshots folder"
 msgstr "Открыть папку со снимками"
 
@@ -2025,7 +2031,7 @@ msgid "Password:"
 msgstr "Пароль:"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:488
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:197
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:198
 #: ../Source/Gui/Dialogs/MainDlg.cpp:158
 #: ../Source/ImageEditor/Gui/InputBoxControl.cpp:239
 msgid "Paste"
@@ -2169,7 +2175,7 @@ msgid "Queued"
 msgstr "В очереди"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:491
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:200
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:201
 msgid "Quick upload image from clipboard"
 msgstr "Загрузить изображение из буфера"
 
@@ -2242,7 +2248,7 @@ msgstr "Повторить"
 msgid "Reupload"
 msgstr "Перезалить"
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:203
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:204
 msgid "Reupload images"
 msgstr "Перезаливка изображений"
 
@@ -2398,8 +2404,8 @@ msgid "Selected server: %s"
 msgstr "Выбран сервер: %s"
 
 #: ../Source/Gui/Controls/MultiServerSelectorControl.cpp:107
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1450
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:1463
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1476
 #, c-format
 msgid "Selected servers: %d"
 msgstr "Выбраны серверы: %d"
@@ -2448,7 +2454,7 @@ msgstr "Имя сервера:"
 msgid "Server not chosen"
 msgstr "Настройки сервера"
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1026
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1039
 msgid "Server settings"
 msgstr "Настройки сервера"
 
@@ -2486,7 +2492,7 @@ msgstr "Всего сессий:"
 
 #: ../Source/Core/Settings/WtlGuiSettings.cpp:183
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:582
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:196
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:197
 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:77
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:105
 msgid "Settings"
@@ -2522,7 +2528,7 @@ msgid "Shorten URL"
 msgstr "Сократить ссылки"
 
 #: ../Source/Gui/Dialogs/ResultsPanel.cpp:893
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1201
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1214
 #, c-format
 msgid "Shorten URL using %s"
 msgstr "Сократить ссылки с помощью %s"
@@ -2532,12 +2538,12 @@ msgid "Shorten URLs"
 msgstr "Сокращать ссылки"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:574
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:201
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:202
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:94
 msgid "Shorten a link"
 msgstr "Сократить ссылку"
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:202
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:203
 msgid "Shorten a link from the clipboard"
 msgstr "Сократить ссылку из буфера"
 
@@ -2556,7 +2562,7 @@ msgstr "Снимок выбранной области..."
 
 #: ../Source/Gui/Dialogs/GeneralSettings.cpp:37
 #: ../Source/Gui/Dialogs/ImageReuploaderDlg.cpp:86
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2274
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2281
 msgid "Show Error Log"
 msgstr "Показать журнал ошибок"
 
@@ -2573,7 +2579,7 @@ msgid "Show log for this file"
 msgstr "Показать лог для этого файла"
 
 #: ../Source/Gui/Dialogs/FloatingWindow.cpp:576
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:194
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:195
 msgid "Show program's window"
 msgstr "Показать окно программы"
 
@@ -2731,7 +2737,7 @@ msgstr "Короткая ссылка скопирована в буфер об
 msgid "This means that the thumbnail will be created by site, not the program."
 msgstr "Это означает, что миниатюры будут создаваться сайтом, а не программой."
 
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1047
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1060
 msgid "This server doesn't have any settings."
 msgstr "У этого сервера нет настроек."
 
@@ -2826,7 +2832,7 @@ msgstr "URL для скачивания:"
 
 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:116
 #: ../Source/Gui/Dialogs/ShortenUrlDlg.cpp:86
-#: ../Source/Gui/Dialogs/UploadSettings.cpp:1115
+#: ../Source/Gui/Dialogs/UploadSettings.cpp:1128
 msgid "URL shortening server"
 msgstr "Сервер для сокращения ссылок"
 
@@ -2839,7 +2845,7 @@ msgstr ""
 msgid "Unable to load picture"
 msgstr "Невозможно загрузить изображение"
 
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:2161
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:2163
 msgid "Unable to make screenshot!"
 msgstr "Невозможно сделать скриншот!"
 
@@ -3029,9 +3035,9 @@ msgstr ""
 "видеофайла."
 
 #: ../Source/Gui/Dialogs/VideoGrabberPage.cpp:383
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1618
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1811
-#: ../Source/Gui/Dialogs/WizardDlg.cpp:1840
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1620
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1813
+#: ../Source/Gui/Dialogs/WizardDlg.cpp:1842
 msgid "Video files"
 msgstr "Видео файлы"
 
@@ -3048,7 +3054,7 @@ msgstr "Просмотр"
 msgid "View BBCode/HTML codes"
 msgstr "Коды BBCode/HTML"
 
-#: ../Source/Gui/Dialogs/HotkeySettings.cpp:199
+#: ../Source/Gui/Dialogs/HotkeySettings.cpp:200
 #: ../Source/Gui/Dialogs/WelcomeDlg.cpp:103
 msgid "View Media File Information"
 msgstr "Информация о медиафайле"
diff --git a/Source/Gui/Controls/ServerSelectorControl.cpp b/Source/Gui/Controls/ServerSelectorControl.cpp
index 57cfe805..448eee97 100644
--- a/Source/Gui/Controls/ServerSelectorControl.cpp
+++ b/Source/Gui/Controls/ServerSelectorControl.cpp
@@ -51,7 +51,7 @@ char* DuplicateString(const char* str) {
 }
 
 // CServerSelectorControl
-CServerSelectorControl::CServerSelectorControl(UploadEngineManager* uploadEngineManager, bool defaultServer, bool isChildWindow)
+CServerSelectorControl::CServerSelectorControl(UploadEngineManager* uploadEngineManager, bool defaultServer, bool isChildWindow, bool showServerIcons)
 {
     showDefaultServerItem_ = false;
     serversMask_ = smImageServers | smFileServers;
@@ -66,6 +66,7 @@ CServerSelectorControl::CServerSelectorControl(UploadEngineManager* uploadEngine
     hMyDlgTemplate_ = nullptr;
     isPopingUp_ = false;
     showEmptyItem_ = false;
+    showServerIcons_ = showServerIcons;
 }
 
 CServerSelectorControl::~CServerSelectorControl()
@@ -389,8 +390,10 @@ void CServerSelectorControl::updateServerList()
 {
     serverComboBox_.ResetContent();
     comboBoxImageList_.Destroy();
-    DWORD rtlStyle = ServiceLocator::instance()->translator()->isRTL() ? ILC_MIRROR | ILC_PERITEMMIRROR : 0;
-    comboBoxImageList_.Create(16, 16, ILC_COLOR32 | ILC_MASK | rtlStyle, 0, 6);
+    if (showServerIcons_) {
+        DWORD rtlStyle = ServiceLocator::instance()->translator()->isRTL() ? ILC_MIRROR | ILC_PERITEMMIRROR : 0;
+        comboBoxImageList_.Create(16, 16, ILC_COLOR32 | ILC_MASK | rtlStyle, 0, 6);
+    }
     
     CMyEngineList* myEngineList = ServiceLocator::instance()->myEngineList();
     if (showEmptyItem_) {
@@ -433,10 +436,13 @@ void CServerSelectorControl::updateServerList()
             if ( !ue->hasType(CUploadEngineData::TypeUrlShorteningServer) && (currentLoopMask & smUrlShorteners) ) {
                 continue;
             }
-            HICON hImageIcon = myEngineList->getIconForServer(ue->Name);
             int nImageIndex = -1;
-            if ( hImageIcon ) {
-                nImageIndex = comboBoxImageList_.AddIcon( hImageIcon);
+            if (showServerIcons_) {
+                HICON hImageIcon = myEngineList->getIconForServer(ue->Name);
+
+                if (hImageIcon) {
+                    nImageIndex = comboBoxImageList_.AddIcon(hImageIcon);
+                }
             }
             char *serverName = new char[ue->Name.length() + 1];
             lstrcpyA( serverName, ue->Name.c_str() );
@@ -457,7 +463,9 @@ void CServerSelectorControl::updateServerList()
         serverComboBox_.AddItem(TR("Add local folder..."), -1, -1, 1, reinterpret_cast<LPARAM>(kAddDirectoryAsServer));
     }
 
-    serverComboBox_.SetImageList( comboBoxImageList_ );
+    if (showServerIcons_) {
+        serverComboBox_.SetImageList(comboBoxImageList_);
+    }
     serverComboBox_.SetCurSel( selectedIndex );
     serverChanged();
 }
diff --git a/Source/Gui/Controls/ServerSelectorControl.h b/Source/Gui/Controls/ServerSelectorControl.h
index fdb1189a..a0fd1fa4 100644
--- a/Source/Gui/Controls/ServerSelectorControl.h
+++ b/Source/Gui/Controls/ServerSelectorControl.h
@@ -45,7 +45,7 @@ class CServerSelectorControl :
     public CDialogIndirectImpl<CServerSelectorControl>
 {
 public:
-    explicit CServerSelectorControl(UploadEngineManager* uploadEngineManager, bool defaultServer = false, bool isChildWindow = true);
+    explicit CServerSelectorControl(UploadEngineManager* uploadEngineManager, bool defaultServer = false, bool isChildWindow = true, bool showServerIcons = true);
 virtual ~CServerSelectorControl();
     enum { IDD = IDD_SERVERSELECTORCONTROL, IDC_LOGINMENUITEM = 4020, IDC_USERNAME_FIRST_ID = 20000, IDC_USERNAME_LAST_ID = 21000,
         IDC_ADD_ACCOUNT= 21001, IDC_NO_ACCOUNT = 21003
@@ -134,6 +134,7 @@ virtual ~CServerSelectorControl();
     HGLOBAL hMyDlgTemplate_;
     std::function<void(CServerSelectorControl*)> onChangeCallback_;
     bool showEmptyItem_;
+    bool showServerIcons_;
 };
 
 #endif
diff --git a/Source/Gui/Dialogs/HotkeySettings.cpp b/Source/Gui/Dialogs/HotkeySettings.cpp
index dd444308..67549488 100644
--- a/Source/Gui/Dialogs/HotkeySettings.cpp
+++ b/Source/Gui/Dialogs/HotkeySettings.cpp
@@ -129,6 +129,14 @@ LRESULT CHotkeySettingsPage::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lPar
     {
         ClientPoint.x = 0;
         ClientPoint.y = 0;
+
+        int nCurItem = m_HotkeyList.GetNextItem(-1, LVNI_ALL | LVNI_SELECTED);
+        if (nCurItem >= 0) {
+            CRect rc;
+            if (m_HotkeyList.GetItemRect(nCurItem, &rc, LVIR_BOUNDS)) {
+                ClientPoint = rc.CenterPoint();
+            }
+        }
         ScreenPoint = ClientPoint;
         ::ClientToScreen(hwnd, &ScreenPoint);
     }
diff --git a/Source/Gui/Dialogs/ServerFolderSelect.cpp b/Source/Gui/Dialogs/ServerFolderSelect.cpp
index d6589e66..a94ea911 100644
--- a/Source/Gui/Dialogs/ServerFolderSelect.cpp
+++ b/Source/Gui/Dialogs/ServerFolderSelect.cpp
@@ -230,49 +230,67 @@ LRESULT CServerFolderSelect::OnFolderlistLbnDblclk(int idCtrl, LPNMHDR pnmh, BOO
 
 LRESULT CServerFolderSelect::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    CMenu sub;
-    MENUITEMINFO mi;
-    mi.cbSize = sizeof(mi);
-    mi.fMask = MIIM_TYPE | MIIM_ID;
-    mi.fType = MFT_STRING;
-    sub.CreatePopupMenu();
-
-    POINT ClientPoint, ScreenPoint;
+    POINT screenPoint{};
     HWND hwnd = reinterpret_cast<HWND>(wParam);
-    if (hwnd != m_FolderTree.m_hWnd)
+    if (hwnd != m_FolderTree.m_hWnd) {
         return 0;
-
-    if (lParam == -1)
-    {
-        ClientPoint.x = 0;
-        ClientPoint.y = 0;
-        ScreenPoint = ClientPoint;
-        ::ClientToScreen(hwnd, &ScreenPoint);
     }
-    else
-    {
-        ScreenPoint.x = GET_X_LPARAM(lParam);
-        ScreenPoint.y = GET_Y_LPARAM(lParam);
-        ClientPoint = ScreenPoint;
-        ::ScreenToClient(hwnd, &ClientPoint);
+
+    HTREEITEM selectedItem{};
+    int xPos = GET_X_LPARAM(lParam);
+    int yPos = GET_Y_LPARAM(lParam);
+
+    if (xPos == -1 && yPos == -1) {
+        // If the context menu is generated from the keyboard, the application should display
+        // the context menu at the location of the current selection rather than at (xPos, yPos).
+        CRect rc;
+        HTREEITEM firstSelectedItem = m_FolderTree.GetNextSelectedItem(nullptr);
+        if (firstSelectedItem) {
+            if (m_FolderTree.GetItemRect(firstSelectedItem, &rc, FALSE) ) {
+                m_FolderTree.MapWindowPoints(nullptr, &rc);
+                screenPoint = { rc.left, rc.bottom };
+                selectedItem = firstSelectedItem;
+            }
+        }
+    } else {
+        screenPoint.x = xPos;
+        screenPoint.y = yPos;
+        POINT clientPoint = screenPoint;
+        ::ScreenToClient(hwnd, &clientPoint);
+
+        UINT flags{};
+        HTREEITEM testItem = m_FolderTree.HitTest(clientPoint, &flags);
+        if (testItem && flags & TVHT_ONITEM) {
+            selectedItem = testItem;
+        }
     }
 
-    UINT flags;
-    HTREEITEM selectedItem = m_FolderTree.HitTest(ClientPoint, &flags);
-    if (!selectedItem)
+    if (!selectedItem) {
         return 0;
+    }
 
     m_FolderTree.SelectItem(selectedItem);
 
     int nIndex = m_FolderTree.GetItemData(selectedItem);
     bool showViewInBrowserItem = false;
+    BOOL copyFolderIdFlag = MFS_DISABLED;
     if (nIndex >= 0 && nIndex < m_FolderList.GetCount()) {
         const CFolderItem& folder = m_FolderList[nIndex];
         if (!folder.getViewUrl().empty()) {
             showViewInBrowserItem = true;
         }
+        if (!folder.getId().empty() && folder.getId() != CFolderItem::NewFolderMark) {
+            copyFolderIdFlag = MFS_ENABLED;
+        }
     }
 
+    CMenu sub;
+    MENUITEMINFO mi;
+    mi.cbSize = sizeof(mi);
+    mi.fMask = MIIM_TYPE | MIIM_ID;
+    mi.fType = MFT_STRING;
+    sub.CreatePopupMenu();
+
     mi.wID = ID_EDITFOLDER;
     CString editStr = TR("Edit");
     mi.dwTypeData = const_cast<LPWSTR>(editStr.GetString());
@@ -290,7 +308,9 @@ LRESULT CServerFolderSelect::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lPar
     mi.dwTypeData = const_cast<LPWSTR>(createNestedFolderStr.GetString());
     sub.InsertMenuItem(2, true, &mi);
 
-    sub.TrackPopupMenu(TPM_LEFTALIGN | TPM_LEFTBUTTON, ScreenPoint.x, ScreenPoint.y, m_hWnd);
+    sub.AppendMenu(MFT_STRING | copyFolderIdFlag, ID_COPYFOLDERID, TR("Copy folder's ID"));
+
+    sub.TrackPopupMenu(TPM_LEFTALIGN | TPM_LEFTBUTTON, screenPoint.x, screenPoint.y, m_hWnd);
     return 0;
 }
 
@@ -356,6 +376,26 @@ LRESULT CServerFolderSelect::OnOpenInBrowser(WORD wNotifyCode, WORD wID, HWND hW
     return 0;
 }
 
+LRESULT CServerFolderSelect::OnCopyFolderId(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+    HTREEITEM item = m_FolderTree.GetSelectedItem();
+
+    if (!item)
+        return 0;
+    int nIndex = m_FolderTree.GetItemData(item);
+
+    if (nIndex <0 || nIndex >= m_FolderList.GetCount()) {
+        return 0;
+    }
+    CFolderItem& folder = m_FolderList[nIndex];
+
+    if (!folder.getId().empty() && folder.getId() != CFolderItem::NewFolderMark) {
+        CString str = U2W(folder.getId());
+
+        WinUtils::CopyTextToClipboard(str);
+    }
+    return 0;
+}
+
 LRESULT CServerFolderSelect::OnCreateNestedFolder(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {
     HTREEITEM item = m_FolderTree.GetSelectedItem();
diff --git a/Source/Gui/Dialogs/ServerFolderSelect.h b/Source/Gui/Dialogs/ServerFolderSelect.h
index 8b48572a..f2aac806 100644
--- a/Source/Gui/Dialogs/ServerFolderSelect.h
+++ b/Source/Gui/Dialogs/ServerFolderSelect.h
@@ -39,6 +39,7 @@
 #define ID_EDITFOLDER 10001
 #define ID_OPENINBROWSER 10002
 #define ID_CREATENESTEDFOLDER 10003
+#define ID_COPYFOLDERID 10004
 
 class UploadEngineManager;
 class ServerProfile;
@@ -62,6 +63,7 @@ class CServerFolderSelect :
         COMMAND_HANDLER(ID_CREATENESTEDFOLDER, BN_CLICKED, OnCreateNestedFolder)      
         COMMAND_HANDLER(IDC_NEWFOLDERBUTTON, BN_CLICKED, OnBnClickedNewfolderbutton)
         COMMAND_ID_HANDLER(ID_EDITFOLDER, OnEditFolder)
+        COMMAND_HANDLER(ID_COPYFOLDERID, BN_CLICKED, OnCopyFolderId)
         NOTIFY_HANDLER(IDC_FOLDERTREE, NM_DBLCLK, OnFolderlistLbnDblclk)
         CHAIN_MSG_MAP(CDialogResize<CServerFolderSelect>)
     END_MSG_MAP()
@@ -88,6 +90,7 @@ class CServerFolderSelect :
     LRESULT OnBnClickedNewfolderbutton(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     LRESULT OnEditFolder(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+    LRESULT OnCopyFolderId(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
     void onTaskFinished(UploadTask* task, bool success);
     void OnLoadFinished();
@@ -120,4 +123,4 @@ class CServerFolderSelect :
     void BuildFolderTree(std::vector<CFolderItem> &list,const CString& parentFolderId);
 };
 
-#endif // SERVERFOLDERSELECT_H
\ No newline at end of file
+#endif // SERVERFOLDERSELECT_H
diff --git a/Source/Gui/Dialogs/UploadSettings.cpp b/Source/Gui/Dialogs/UploadSettings.cpp
index 41891153..05d62c93 100644
--- a/Source/Gui/Dialogs/UploadSettings.cpp
+++ b/Source/Gui/Dialogs/UploadSettings.cpp
@@ -944,16 +944,17 @@ void CUploadSettings::OnFolderButtonContextMenu(POINT pt, bool isImageServerTool
     ServerProfile & serverProfile = isImageServerToolbar ? getSessionImageServerItem() : getSessionFileServerItem();
 
     CMenu sub;    
-    MENUITEMINFO mi;
-    mi.cbSize = sizeof(mi);    
-    mi.fMask = MIIM_TYPE | MIIM_ID;
-    mi.fType = MFT_STRING;
-
     sub.CreatePopupMenu();
-    mi.wID = IDC_NEWFOLDER + static_cast<int>(isImageServerToolbar);
-    CString newFolderStr = TR("New folder");
-    mi.dwTypeData = const_cast<LPWSTR>(newFolderStr.GetString());
-    sub.InsertMenuItem(0, true, &mi);
+
+    sub.AppendMenu(MFT_STRING, IDC_NEWFOLDER + static_cast<int>(isImageServerToolbar), TR("New folder"));
+
+    if (!serverProfile.folderId().empty()) {
+        UINT flags = MFT_STRING;
+        if (serverProfile.folderId().empty() || serverProfile.folderId() == CFolderItem::NewFolderMark) {
+            flags |= MFS_DISABLED;
+        }
+        sub.AppendMenu(flags, IDC_COPYFOLDERID + static_cast<int>(isImageServerToolbar), TR("Copy folder's ID"));
+    }
 
     if (!serverProfile.folderUrl().empty()) {
         sub.AppendMenu(MFT_STRING, IDC_OPENINBROWSER + static_cast<int>(isImageServerToolbar), TR("Open in Web Browser"));
@@ -1009,6 +1010,18 @@ LRESULT CUploadSettings::OnOpenInBrowser(WORD /*wNotifyCode*/, WORD wID, HWND /*
     }
     return 0;
 }
+
+LRESULT CUploadSettings::OnCopyFolderId(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+    bool ImageServer = (wID % 2) != 0;
+    ServerProfile& serverProfile = ImageServer ? getSessionImageServerItem() : getSessionFileServerItem();
+    std::string folderId = serverProfile.folderId();
+    if (!folderId.empty() && folderId != CFolderItem::NewFolderMark) {
+        CString str = U2W(folderId);
+   
+        WinUtils::CopyTextToClipboard(str);
+    }
+    return 0;
+}
     
 void CUploadSettings::OnServerButtonContextMenu(POINT pt, bool isImageServerToolbar)
 {
diff --git a/Source/Gui/Dialogs/UploadSettings.h b/Source/Gui/Dialogs/UploadSettings.h
index ac165434..b66e975e 100644
--- a/Source/Gui/Dialogs/UploadSettings.h
+++ b/Source/Gui/Dialogs/UploadSettings.h
@@ -40,6 +40,7 @@ constexpr unsigned int IDC_OPENINBROWSER = 4014;
 constexpr unsigned int IDC_SERVERPARAMS = 4016;
 constexpr unsigned int IDC_OPENREGISTERURL = 4018;
 constexpr unsigned int IDC_LOGINTOOLBUTTON = 4020;
+constexpr unsigned int IDC_COPYFOLDERID = 4022;
 
 constexpr unsigned int IDC_TOOLBARSEPARATOR1 = 4002;
 constexpr unsigned int IDC_TOOLBARSEPARATOR2 = 4003;
@@ -95,6 +96,9 @@ class CUploadSettings:
         COMMAND_HANDLER(IDC_NEWFOLDER+1, BN_CLICKED, OnNewFolder)
         COMMAND_HANDLER(IDC_OPENINBROWSER, BN_CLICKED, OnOpenInBrowser)
         COMMAND_HANDLER(IDC_OPENINBROWSER+1, BN_CLICKED, OnOpenInBrowser)
+        COMMAND_HANDLER(IDC_COPYFOLDERID, BN_CLICKED, OnCopyFolderId)
+        COMMAND_HANDLER(IDC_COPYFOLDERID + 1, BN_CLICKED, OnCopyFolderId)
+
         COMMAND_HANDLER(IDC_OPENREGISTERURL, BN_CLICKED, OnOpenSignupPage)
         COMMAND_HANDLER(IDC_OPENREGISTERURL+1, BN_CLICKED, OnOpenSignupPage)
         COMMAND_HANDLER(IDC_SERVERPARAMS, BN_CLICKED, OnServerParamsClicked)
@@ -149,6 +153,7 @@ class CUploadSettings:
     LRESULT OnFileServerSelect(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNewFolder(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnOpenInBrowser(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnCopyFolderId(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnServerParamsClicked(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnServerDropDown(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
     LRESULT OnOpenSignupPage(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
diff --git a/Source/Gui/Dialogs/WizardDlg.cpp b/Source/Gui/Dialogs/WizardDlg.cpp
index de134f52..cbd5ba77 100644
--- a/Source/Gui/Dialogs/WizardDlg.cpp
+++ b/Source/Gui/Dialogs/WizardDlg.cpp
@@ -1740,9 +1740,34 @@ LRESULT CWizardDlg::OnEnable(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/
 
 void CWizardDlg::CloseWizard()
 {
-    if(CurPage!= wpWelcomePage && CurPage!= wpUploadPage && Settings.ConfirmOnExit)
-        if(LocalizedMessageBox(TR("Are you sure to quit?"),APPNAME, MB_YESNO|MB_ICONQUESTION) != IDYES) return ;
-    
+    if(CurPage!= wpWelcomePage && CurPage!= wpUploadPage && Settings.ConfirmOnExit) {
+        int buttonPressed{};
+        CTaskDialog dlg;
+        CString verText = TR("Do not ask again");
+        dlg.SetVerificationText(verText);
+        CString contentText = TR("Are you sure to quit?");
+        dlg.SetContentText(contentText);
+        CString windowTitle = APPNAME;
+        dlg.SetWindowTitle(windowTitle);
+        dlg.SetCommonButtons(TDCBF_YES_BUTTON | TDCBF_NO_BUTTON);
+        // From the official Win32 style guide: don't use the question mark icon to ask questions. Don't routinely replace
+        // question mark icons with warning icons. Replace a question mark icon with a warning icon only if the question
+        // has significant consequences. Otherwise, use no icon.
+        //dlg.SetMainIcon(TD_WARNING_ICON);
+        DWORD flags = TDF_POSITION_RELATIVE_TO_WINDOW | TDF_ALLOW_DIALOG_CANCELLATION;
+        if (ServiceLocator::instance()->translator()->isRTL()) {
+            flags |= TDF_RTL_LAYOUT;
+        }
+        dlg.ModifyFlags(0, flags);
+        BOOL verificationFlagChecked = FALSE;
+        int res = dlg.DoModal(m_hWnd, &buttonPressed, nullptr, &verificationFlagChecked);
+        if (verificationFlagChecked) {
+            Settings.ConfirmOnExit = false;
+        }
+        if (SUCCEEDED(res) && buttonPressed != IDYES) {
+            return;
+        }
+    }
     CloseDialog(0);
 }
 
diff --git a/TODO.txt b/TODO.txt
index 3679cb2b..12abebb9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,4 +4,5 @@
 - Convert korean.lng and farsi.lng ?
 - Proxy provided by DefaultProxyProvider not being changed on redirects
 - Fix log window buttons moving when RTL is on
-- Fix function names in docs (CSelection etc.)
\ No newline at end of file
+- Fix function names in docs (CSelection etc.)
+- File name conflict when uploading to Yandex.disk
\ No newline at end of file