Don't make the dialog larger than necessary

We don't need to add 20 pixels to the calculated height. And for the
width we want to add the left and right margin (instead of a magic 20),
but only to the content width of the expander. The size hint of the
dialog already contains the margins.

• GnuPG-bug-id: T6117