I've heard that the L-Theanine [1] in green tea is responsible for a calmer caffeine effect. Although I haven't tried it, I've heard that you can get the same results by taking a supplement before your morning coffee.
If you want to try it out, make sure you get Suntheanine. A dose that works for many is twice the theanine than caffeine, but YMMV.