Fix for custom date format
Tabs to spaces
Merge pull request #974 from ExchangeCore/fixes-880

Fixes 880