Rationalze the headers.
  Rationalise the header-files that are included.
  Added function to toggle long/short names for maildirs.