Get rid of the separate dialog for offline and diskspace settings. Move them to a new tab called Offline and Disk Space under the advanced panel.
Created attachment 179777 [details] [diff] [review] the fix note: this patch contains some parts of Bug #262626 in it.
*** Bug 260252 has been marked as a duplicate of this bug. ***