[nerbert]

I think I got it.

editpost.php lines 315 to 328

		if (!$vbulletin->GPC['advanced'])
		{
			if ($vbulletin->GPC_exists['emailupdate'])
			{
				$edit['emailupdate'] =& $vbulletin->GPC['emailupdate'];
			}
			else
			{
				$array = array_keys(fetch_emailchecked($threadinfo)); $edit['emailupdate'] = array_pop($array);
			}
			if ($vbulletin->GPC_exists['htmlstate'] AND $foruminfo['allowhtml'])
			{
				$array = array_keys(fetch_htmlchecked($vbulletin->GPC['htmlstate'])); $edit['htmlstate'] = array_pop($array); 
			}
		}

This preserves the original line numbers. Anyone want to confirm this?