diff --git a/MyTracks/res/layout/choose_upload_service.xml b/MyTracks/res/layout/choose_upload_service.xml
index 3b24cf482..2e20d0cbe 100644
--- a/MyTracks/res/layout/choose_upload_service.xml
+++ b/MyTracks/res/layout/choose_upload_service.xml
@@ -39,7 +39,6 @@ limitations under the License.
         android:layout_width="0dp" >
         <RadioButton
           android:id="@+id/choose_upload_service_new_map"
-          android:text="@string/send_google_new_map"
           style="@style/TextMedium" />
         <RadioButton
           android:id="@+id/choose_upload_service_existing_map"
@@ -54,7 +53,7 @@ limitations under the License.
         style="@style/ChooseUploadServiceImageView" />
       <CheckBox
         android:id="@+id/choose_upload_service_fusion_tables"
-        android:text="@string/send_google_fusion_tables"
+        android:text="@string/send_google_fusion_tables_new_public_table"
         style="@style/ChooseUploadServiceCheckBox" />
     </TableRow>
     <TableRow>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index c38cbbb95..e58ac8dd0 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1281,19 +1281,28 @@ limitations under the License.
     Use existing map
   </string>
   <string name="send_google_fusion_tables"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
-      checkbox option to send to Google Fusion Tables.">
+    translation_description="When sending a track to Google, the Google Fusion Tables name.">
     Google Fusion Tables
   </string>
+  <string name="send_google_fusion_tables_new_public_table"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
+      checkbox option to send to Google Fusion Tables as a new public table.">
+    Google Fusion Tables\n(new public table)
+  </string>
   <string name="send_google_maps"
     translation_description="When sending a track to Google, under the 'Send to...' dialog, the
       checkbox option to send to Google Maps.">
     Google Maps
   </string>
-  <string name="send_google_new_map"
+  <string name="send_google_new_public_map"
     translation_description="When sending a track to Google Maps, the radio option to create a
-      new map as opposed to use an existing map.">
-    Create new map
+      new public map as opposed to use an existing map.">
+    Create new public map 
+  </string>
+  <string name="send_google_new_unlisted_map"
+    translation_description="When sending a track to Google Maps, the radio option to create a
+      new unlisted map as opposed to use an existing map.">
+    Create new unlisted map 
   </string>
   <string name="send_google_no_account_message"
     translation_description="When sending to Google, the dialog message when no Google account is
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 3f1565cf0..1d3f36672 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -36,6 +36,7 @@ limitations under the License.
     <item name="android:layout_gravity">center_vertical</item>
     <item name="android:layout_marginLeft">8dp</item>
     <item name="android:layout_width">0dp</item>
+    <item name="android:maxLines">5</item>
   </style>
   <!-- The style for choose upload service image view -->
   <style name="ChooseUploadServiceImageView">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java
index 7c4c33c0f..0f5fdd2bb 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseUploadServiceDialogFragment.java
@@ -90,8 +90,14 @@ public class ChooseUploadServiceDialogFragment extends DialogFragment {
     });
 
     mapsOptionTableRow = (TableRow) view.findViewById(R.id.choose_upload_service_maps_options);
+
     RadioButton newMapRadioButton = (RadioButton) view.findViewById(
         R.id.choose_upload_service_new_map);
+    boolean defaultMapPublic = PreferencesUtils.getBoolean(getActivity(),
+        R.string.default_map_public_key, PreferencesUtils.DEFAULT_MAP_PUBLIC_DEFAULT);
+    newMapRadioButton.setText(defaultMapPublic ? R.string.send_google_new_public_map
+        : R.string.send_google_new_unlisted_map);
+
     existingMapRadioButton = (RadioButton) view.findViewById(
         R.id.choose_upload_service_existing_map);