Fixes some issues with attachment context menu