Nuntium - header responses - better [token] replace

Change-Id: I10f46f00908435a434308a0e95d19431a104ab4a