Swapped position of Message and Files