Constant menu choices

[Jaltos]

Rigthclicking on a flask gives thoses two options: Empty and Drink.
Rightclicking on a mug gives thoses two options: Drink and Empty.

I often find myself misclicking thinking I'm drinking for a flask when I'm actually drinking tea in a mug... I end up emptying my tea mug.