brianegge/fix-message-viewer archive