Movement and attack should require different mouseclicks. Several times I accidentally attacked and NPC or monster when I only wanted to move to the square next to them. A Shift/Ctrl/Alt+RightClick would make it somewhat less automatic - granted, somewhat less intuitive.
