Message class is now expanded for better attachment handling