Index: src/ch/CfgProperties.h
===================================================================
diff -u -r2b57bcded3d6ce4fe87b73dc0227e7ec82628505 -rd037fe7234987387e26b0be460be37a956fcb27d
--- src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision 2b57bcded3d6ce4fe87b73dc0227e7ec82628505)
+++ src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision d037fe7234987387e26b0be460be37a956fcb27d)
@@ -32,8 +32,11 @@
 	PP_PCLIPBOARDMONITORING = 0,
 	PP_PMONITORSCANINTERVAL,
 	PP_PRELOADAFTERRESTART,
+
 	PP_PCHECK_FOR_UPDATES_FREQUENCY,
 	PP_PUPDATECHANNEL,
+	PP_PUPDATE_USE_SECURE_CONNECTION,
+
 	PP_PSHUTDOWNAFTREFINISHED,
 	PP_PTIMEBEFORESHUTDOWN,
 	PP_PFORCESHUTDOWN,
@@ -62,6 +65,7 @@
 	PP_CMPROTECTROFILES,
 	PP_CMLIMITMAXOPERATIONS,
 	PP_CMREADSIZEBEFOREBLOCKING,
+	PP_CMFASTMOVEBEFOREBLOCKING,
 
 	PP_CMDEFAULTPRIORITY,
 	PP_CMDISABLEPRIORITYBOOST,
@@ -129,6 +133,13 @@
 	eDNS_HideAndDontRegister = 2
 };
 
+enum EUseSecureConnection
+{
+	eSecure_No = 0,
+	eSecure_Yes = 1,
+	eSecure_Auto = 2
+};
+
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // specific branches in configuration
 
@@ -180,6 +191,7 @@
 
 PROPERTY_MINMAX(PP_PCHECK_FOR_UPDATES_FREQUENCY, unsigned int, _T("CHConfig.General.Program.Updates.Frequency"), eFreq_Weekly, eFreq_Never, eFreq_Max - 1);
 PROPERTY_MINMAX(PP_PUPDATECHANNEL, int, _T("CHConfig.General.Program.Updates.UpdateChannel"), UpdateVersionInfo::eReleaseCandidate, UpdateVersionInfo::eStable, UpdateVersionInfo::eMax - 1);
+PROPERTY_MINMAX(PP_PUPDATE_USE_SECURE_CONNECTION, unsigned int, _T("CHConfig.General.Program.Updates.UseSecureConnection"), eSecure_Auto, eSecure_No, eSecure_Auto);
 
 PROPERTY(PP_PPROCESSPRIORITYCLASS, int, _T("CHConfig.General.Program.ProcessPriority"), NORMAL_PRIORITY_CLASS);
 PROPERTY(PP_PLANGUAGE, CString, _T("CHConfig.General.Program.Language"), _T("<PROGRAM>\\Langs\\English.lng"));
@@ -236,6 +248,7 @@
 ADAPT_TASK_PROPERTY(PP_CMSETDESTDATE, chcore::eTO_SetDestinationDateTime);
 ADAPT_TASK_PROPERTY(PP_CMPROTECTROFILES, chcore::eTO_ProtectReadOnlyFiles);
 ADAPT_TASK_PROPERTY(PP_CMREADSIZEBEFOREBLOCKING, chcore::eTO_ScanDirectoriesBeforeBlocking);
+ADAPT_TASK_PROPERTY(PP_CMFASTMOVEBEFOREBLOCKING, chcore::eTO_FastMoveBeforeBlocking);
 ADAPT_TASK_PROPERTY(PP_CMDEFAULTPRIORITY, chcore::eTO_ThreadPriority);
 ADAPT_TASK_PROPERTY(PP_CMDISABLEPRIORITYBOOST, chcore::eTO_DisablePriorityBoost);
 ADAPT_TASK_PROPERTY(PP_CMDELETEAFTERFINISHED, chcore::eTO_DeleteInSeparateSubTask);
@@ -250,7 +263,7 @@
 PROPERTY(PP_SHSHOWMOVETO, bool, _T("CHConfig.ShellExtension.ShowCommands.MoveTo"), true);
 PROPERTY(PP_SHSHOWCOPYMOVETO, bool, _T("CHConfig.ShellExtension.ShowCommands.CopyToMoveToSpecial"), true);
 PROPERTY(PP_SHSHOWFREESPACE, bool, _T("CHConfig.ShellExtension.ShowFreeSpaceAlongShortcuts"), true);
-PROPERTY(PP_SHSHOWSHELLICONS, bool, _T("CHConfig.ShellExtension.ShowShortcutsShellIcons"), false);
+PROPERTY(PP_SHSHOWSHELLICONS, bool, _T("CHConfig.ShellExtension.ShowShortcutsShellIcons"), true);
 PROPERTY(PP_SHINTERCEPTDRAGDROP, bool, _T("CHConfig.ShellExtension.InterceptDragDrop"), true);
 PROPERTY(PP_SHINTERCEPTKEYACTIONS, bool, _T("CHConfig.ShellExtension.InterceptKeyboardActions"), true);
 PROPERTY(PP_SHINTERCEPTCTXMENUACTIONS, bool, _T("CHConfig.ShellExtension.InterceptDefaultContextMenuActions"), false);