Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp	(revision 20137)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp	(revision 20138)
@@ -126,6 +126,6 @@
 
     mExportToFileSystemDesc = tr("Please choose a filename to export the OVF in.");
-    mExportToSunCloudDesc = tr("Please complete the additionally fields like the username, password & the bucket. Finally you have to provide a filename for the OVF target.");
-    mExportToS3Desc = tr("Please complete the additionally fields like the username, password, hostname & the bucket. Finally you have to provide a filename for the OVF target.");
+    mExportToSunCloudDesc = tr("Please complete the additionally fields like the username, password and the bucket. Finally you have to provide a filename for the OVF target.");
+    mExportToS3Desc = tr("Please complete the additionally fields like the username, password, hostname and the bucket. Finally you have to provide a filename for the OVF target.");
 
     switch (currentStorageType())
@@ -455,4 +455,5 @@
             mLblBucket->setVisible (false);
             mLeBucket->setVisible (false);
+            mSelectOVF09->setVisible (true);
             mFileSelector->setChooserVisible (true);
             mFileSelector->setFocus();
@@ -470,4 +471,6 @@
             mLblBucket->setVisible (true);
             mLeBucket->setVisible (true);
+            mSelectOVF09->setVisible (false);
+            mSelectOVF09->setChecked (false);
             mFileSelector->setChooserVisible (false);
             mLeUsername->setFocus();
@@ -485,4 +488,5 @@
             mLblBucket->setVisible (true);
             mLeBucket->setVisible (true);
+            mSelectOVF09->setVisible (true);
             mFileSelector->setChooserVisible (false);
             mLeUsername->setFocus();
Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxExportApplianceWzd.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxExportApplianceWzd.ui	(revision 20137)
+++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxExportApplianceWzd.ui	(revision 20138)
@@ -661,5 +661,5 @@
             <widget class="QLabel" name="mLblHostname">
              <property name="text">
-              <string>&amp;Hostname</string>
+              <string>&amp;Hostname:</string>
              </property>
              <property name="buddy">