The main reason I moved this around is because I need the mapping of old-suid to server-id for the nonlocal op. Especially in the case of a perma-deleted message, this is important because there's no entry in the database at all anymore.