Removed spurious check for envelope from address