Quassel IRC

Situation: An /msg spam bot attack which involves hundreds of queries with same spam message (I got 300 messages in three batches today within one minute).
Goals:
1) Save logs.
2) Delete the query from the tree in a way which:
2.1) would have it re-appear if a same nick messages again
2.2) does not clutter channel tree (not even the show/hide channels one)

Current solutions:
A) Rely on usermodes which block queries, so you have server buffer spammed with 'n!u@h messaged you but you have mode +g' -- with a risk of saving an IP of a legitimate query; or
B) Right click, delete chat - but logs aren't saved (see 1); or
C) Temporarily hide and enjoy seeing a 300 windows list every time I need to unhide a channel/query (see 2.2).

Ideal solution:
Have a 'close buffer' button which erases the buffer item from the tree entirely, but keeps it in logs, so if the same nick messages again, the backlog is retrieved.