diff -ur a/rhythmbox-0.13.1/sources/rb-media-player-source.c b/rhythmbox-0.13.1/sources/rb-media-player-source.c
--- a/rhythmbox-0.13.1/sources/rb-media-player-source.c	2010-08-30 09:41:51.000000000 +0300
+++ b/rhythmbox-0.13.1/sources/rb-media-player-source.c	2010-10-16 02:50:50.000000000 +0300
@@ -62,6 +62,7 @@
 	GtkWidget *sync_dialog;
 	GtkWidget *sync_dialog_label;
 	GtkWidget *sync_dialog_error_box;
+	GtkWidget *sync_dialog_continue_button;
 	guint sync_dialog_update_id;
 
 	/* sync state */
@@ -580,20 +581,29 @@
 {
 	RBMediaPlayerSourcePrivate *priv = MEDIA_PLAYER_SOURCE_GET_PRIVATE (source);
 	gboolean can_continue;
+	gboolean enough_space = TRUE;
 
 	if (sync_has_items_enabled (source) == FALSE) {
 		can_continue = FALSE;
 		gtk_label_set_text (GTK_LABEL (priv->sync_dialog_label),
 				    _("You have not selected any music, playlists, or podcasts to transfer to this device."));
 	} else if (sync_has_enough_space (source) == FALSE) {
-		can_continue = FALSE;
+		can_continue = TRUE;
+		enough_space = FALSE;
+		gtk_button_set_label(priv->sync_dialog_continue_button,
+									_("Sync anyway")
+									);
+
 		gtk_label_set_text (GTK_LABEL (priv->sync_dialog_label),
 				    _("There is not enough space on the device to transfer the selected music, playlists and podcasts."));
 	} else {
+	  gtk_button_set_label(priv->sync_dialog_continue_button,
+								  _("Sync with the device")
+								  );
 		can_continue = TRUE;
 	}
 
-	gtk_widget_set_visible (priv->sync_dialog_error_box, !can_continue);
+	gtk_widget_set_visible (priv->sync_dialog_error_box, !(can_continue && enough_space) );
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (priv->sync_dialog), GTK_RESPONSE_YES, can_continue);
 }
 
@@ -644,13 +654,18 @@
 	priv->sync_dialog = gtk_dialog_new_with_buttons (title,
 							 NULL,
 							 0,
-							 _("Sync with the device"),
-							 GTK_RESPONSE_YES,
-							 _("Don't sync"),
-							 GTK_RESPONSE_CANCEL,
 							 NULL);
 	g_free (title);
 
+	priv->sync_dialog_continue_button = 
+	  gtk_dialog_add_button(priv->sync_dialog,																				 _("Sync with the device"),
+									GTK_RESPONSE_YES
+									);
+
+	gtk_dialog_add_button(priv->sync_dialog,		
+								 _("Don't sync"),
+								 GTK_RESPONSE_CANCEL);
+
 	priv->sync_dialog_update_id = g_signal_connect_object (priv->sync_state,
 							       "updated",
 							       G_CALLBACK (sync_dialog_state_update),
