Wrong order URL when you use URL language prefixes

The default mail content looks like this:

<p>You can find the status of your current order at: [site:url]user/[commerce-order:uid]/orders/[commerce-order:order-id]</p>

If you use language prefixes for your site, the result is a wrong URL:

<p>You can find the status of your current order at: http://example.com/deuser/1/orders/22</p>

Notice the missing slash between "de" (the language prefix) and "user".

A simple fix:
add the slash so that you get [site:url]/user/[commerce-order:uid]/orders/[commerce-order:order-id]

A probably better fix:
use the token [commerce-order:customer-url] instead of [site:url]user/[commerce-order:uid]/orders/[commerce-order:order-id]

I think it would be better to use [commerce-order:customer-url], because (I think) it should take into account if you change the default user path (with Pathauto, for example).