Use effective_message_timestamp for incoming messages
Fix wrongly swapped filenames