New order email - customer address

[kittidid]

#1..............................................................................

........

Here is a copy of the way I receive a customers new order. The address line should only show 3 lines.

 

Example of what I get now:

Customers Name

1107 Russell Road

Alexandria, VA (to many spaces here) 22301

USA

 

For some reason the spaces in between the state and zip will not show here. But in the emails they are there. There is about 4 spaces that show in the address line in between state and zip.

 

I need for it to show:

Customers Name

1107 Russell Road

Alexandria, VA 22301 USA

 

You notice that I removed some spacing in between state and zip. I also want the USA on the same line as the state and zip.

 

What files do I need to look in to change this?

 

#2..............................................................................

......................

I also want to add the Customers Order ID to the extra credit card email I receive. How do I change this?

 

Thanks for your attention. Appreciated.

Kitti