Fetch message should live within retry code

@abersager
@pbadenski