Weird formatting of the date field in Customer Emails

Hey guys,
Since the update to version 2 of Opencart we have been having some date formatting issues. It didn't come to my attention until a customer replied back to our Order Shipment email, and I saw this <see below>. Anyone have this issue before, and is there a known solution? Thanks!

Order ID: 41243
Date Ordered: 15pm31America/Los_Angeles_f2015Fri, 15 May 2015 19:37:34 -070005pm31_34072015Fri, 15 May 2015 19:37:34 -070031

Your order has been updated to the following status:
Shipped

The comments for your order are:
Order Shipped on 05/18/2015 via Priority Mail Tracking Number is: 9405511899562344213207

Please reply to this email if you have any questions.

Hello

Check this post for the solution

http://forum.opencart.com/viewtopic.php?f=190&t=143115

So this did fix the order invoice that the customer receives when they first place an order, but I am still having the same issue whenever the customer receives the order update email. For example, when we ship the order and they receive the email with the tracking information, this is what that email looks like.

Order ID: 41550
Date Ordered: 29am31America/Los_Angeles_f2015Fri, 29 May 2015 11:44:20 -070005am31_20112015Fri, 29 May 2015 11:44:20 -070031

Your order has been updated to the following status:
Shipped

The comments for your order are:
Order Shipped on 05/29/2015 via Priority Mail Tracking Number is: 1

Please reply to this email if you have any questions.