fixing undefined variable
fixing date time display
Merge branch 'master' of github.com:owncloud/mail
fixing mail body extraction
correct function names
Merge pull request #33 from owncloud/fixing-content-display-master

Fixing content display master
Merge branch 'master' into restore-send-and-autocomplete-master

Conflicts:
	lib/message.php