Added a class to handle receiving either (a) messages only or (b) 
both files and messages.