diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 688a7fab7a0..a9065dd28b3 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -46,7 +46,7 @@
 
     <p>Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},</p>
     
-    <p>Your order for ${object.partner_id.name} has just been validated: </p>
+    <p>An order from ${object.company_id.name} for ${object.partner_id.name} has just been validated: </p>
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -63,33 +63,14 @@
     </p>
 
     <p>
-    You can view the order confirmation document, download it and pay online using the following link:
+    You can view the order confirmation document and download it using the following link:
     </p>
             <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
                href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
 
-    % if object.company_id.paypal_account:
-    <%
-    comp_name = quote(object.company_id.name)
-    order_name = quote(object.name)
-    paypal_account = quote(object.company_id.paypal_account)
-    order_amount = quote(str(object.amount_total))
-    cur_name = quote(object.pricelist_id.currency_id.name)
-    paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s" \
-       "&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1" \
-       "&amp;bn=OpenERP_Order_PayNow_%s" % \
-       (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-    %>
-    <br/>
-    <p>It is also possible to directly pay with Paypal:</p>
-        <a style="margin-left: 120px;" href="${paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
-        </a>
-    % endif
-
     <br/>
     <p>If you have any question, do not hesitate to contact us.</p>
-    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
+    <p>Thank you!</p>
     <br/>
     <br/>
     <div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
@@ -128,7 +109,7 @@
             <field name="body_text"><![CDATA[
 Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},
 
-Your order for ${object.partner_id.name} has just been validated:
+An order from ${object.company_id.name} for ${object.partner_id.name} has just been validated:
        | Order number: *${object.name}*
        | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
        | Order date: ${object.date_order}
@@ -140,28 +121,12 @@ Your order for ${object.partner_id.name} has just been validated:
        % endif
        | Your contact: ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
 
-You can view the order confirmation, download it and even pay online using the following link:
+You can view the order confirmation and download it using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
-% if object.company_id.paypal_account:
-<% 
-comp_name = quote(object.company_id.name)
-order_name = quote(object.name)
-paypal_account = quote(object.company_id.paypal_account)
-order_amount = quote(str(object.amount_total))
-cur_name = quote(object.pricelist_id.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s" \
-             "&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s" % \
-             (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
 If you have any question, do not hesitate to contact us.
 
-
-Thank you for choosing ${object.company_id.name}!
+Thank you!
 
 
 --