The British pattern 58 water bottle can be combined with a steel mug.

http://www.the-outdoor.co.uk/ishop/853/shopscr207.html

http://www.the-outdoor.co.uk/ishop/853/shopscr147.html

That is what I use but am looking serously at the Trangia Mess tin.