Thread:Support/"next message" link on deletion pages

I've accidentally saved a apparently optional message, deleted it, and got the deletion confirmation page. Then I hit the "edit next messaage" button (">>>") and got the page shown in the screen shot - i.e. the wiki was trying to delete the next message which fortunately did not exist (yet)

I believe, this is not the intended behavior.
 * Likely, the "next/previous message" links should not be shown in the "delete" context?
 * Or, they should be there, but not pass the parameter  on?
 * Or it could remain, but  be appended behind it?