>Actually, just saw a simple way to fix this (i.e. what I'd do if I had to do it): move the "save to folder" combo to the bottom or top of 3rd column instead of it having a column for itself.
The headers vary from one message to another. Sometimes, this is full with more details, sometimes less. Also, more content will be added.