[DO NOT MERGE] Messing with the Message Index

I need to know what scrutinizer thinks about the commit. ;D