Index: /trunk/src/VBox/Installer/win/PublicProperties.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58792)
+++ /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58793)
@@ -30,9 +30,4 @@
                Value="{}"><![CDATA[VBOX_INSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
 
-  <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
-  <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
-  <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
-               Value="{}"><![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]></SetProperty>
-
   <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
   <Property Id="VBOX_START" Value="1" Secure="yes"/>
Index: /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 58792)
+++ /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 58793)
@@ -95,5 +95,11 @@
     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40"
                Win64="$(var.Property_Win64)" KeyPath="yes">
-        <Condition>VBOX_REGISTERFILEEXTENSIONS</Condition>
+               
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Condition><![CDATA[(local_VBOX_REGISTERFILEEXTENSIONS="1")]]></Condition>
+<?else ?>
+            <Condition><![CDATA[(VBOX_REGISTERFILEEXTENSIONS)]]></Condition>
+<?endif ?>
+
         <!-- Register file extensions. Note: Extension IDs *must not* be changed! These specify the actual
              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
Index: /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs	(revision 58792)
+++ /trunk/src/VBox/Installer/win/VBoxMergeApp.wxs	(revision 58793)
@@ -51,4 +51,10 @@
         <?include PublicProperties.wxi ?>
 
+
+        <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" /> 
+        <Configuration Name="argRegesterExtensions" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegesterExtensions]"/> 
+        <CustomAction Id="registerExtensions" Property="local_VBOX_REGISTERFILEEXTENSIONS" Value="[local_VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" /> 
+
         <!-- Here comes the file/directory list -->
         <Directory Id="TARGETDIR" Name="SourceDir">
@@ -65,4 +71,5 @@
 
         <InstallExecuteSequence>
+            <Custom Action="registerExtensions" After="AppSearch"/>
             <?include VBoxMergeAppSeq.wxi ?>
         </InstallExecuteSequence>
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58792)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58793)
@@ -69,4 +69,12 @@
 <?endif ?>
 
+    <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
+    <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
+
+    <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both" Value="{}">
+        <![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]>
+     </SetProperty>
+
+
     <!-- Install the product for all users on the system -->
     <Property Id="ALLUSERS"><![CDATA[1]]></Property>
@@ -222,5 +230,7 @@
                 <Directory Id="INSTALLDIR" Name="VirtualBox">
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1" />
+                <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1">
+                    <ConfigurationData Name="argRegesterExtensions" Value="[VBOX_REGISTERFILEEXTENSIONS]"/> 
+                </Merge>
     <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
                 <Merge Id="msm_VBoxCOM32On64" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeCOM32On64)" DiskId="1" />