Tests for restoring + retry on oauth token error
Revert "Format according to android standards"

This reverts commit a207e5671fe17e3ed30961e7964ece772eae2345.

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml
Format to standards (only prefs)
FQ
Don't expose imapstore in config