Added Message-Id regeneration