Cleaning autogenerated stuff
Partial: preparing a rescan command that will reindex individual messages