--- payment/uc_paypal/uc_paypal.pages.inc	2009-04-18 09:29:16.000000000 +0200
+++ uc_paypal.pages.inc.bill	2009-07-09 21:48:15.000000000 +0200
@@ -205,7 +205,12 @@ function uc_paypal_ec_review() {
 
     $order->billing_first_name = check_plain($nvp_response['FIRSTNAME']);
     $order->billing_last_name = check_plain($nvp_response['LASTNAME']);
-    $order->billing_street1 = check_plain($nvp_response['EMAIL']);
+    // copy shipping info to billing info
+    $order->billing_street1 = $order->delivery_street1;
+    $order->billing_city = $order->delivery_city;
+    $order->billing_zone = $order->delivery_zone;
+    $order->billing_postal_code = $order->delivery_postal_code;
+    $order->billing_country = $order->delivery_country;
 
     if (empty($order->primary_email)) {
       $order->primary_email = $nvp_response['EMAIL'];