Fixed even more bugs in the upgrade schema (there may be a number of commits like this, as we are testing the upgrade script on a temp server)
These emotions where taken from Mozilla Thunderbird.
I hope they don't get angry if I use them here after all this is a open source project aswell.