Thanks, capt'n, but I went through all the options once I installed the patch ;)
Anyway, it seems that manual sheathe and unsheathe were not what I expected. During a quest Geralt still automatically unsheathes his weapon, and when you sheathe it inside combat Geralt still remains in agro...