For my future reference (seems like I have to do this more often than I should have to):
Normal Reset – *#7780#
It will restore ini files from ROM keeping all your data (themes, 3rd party applications, video, photos, and music files).
Deep Reset – *#7370#
Completely format phone memory. Default files are cleaned up and rewritten.
The default security [...]