Now uses the iOS Category identifier

MAPI-493
The indentation is out of whack on both of these changes.