diff --git a/chatmastermind/main.py b/chatmastermind/main.py
index b3bd1b8..951d3cf 100755
--- a/chatmastermind/main.py
+++ b/chatmastermind/main.py
@@ -2,17 +2,16 @@
 # -*- coding: utf-8 -*-
 # vim: set fileencoding=utf-8 :
 
-import yaml
 import sys
 import argcomplete
 import argparse
 from pathlib import Path
-from .utils import terminal_width, print_tag_args, print_chat_hist, display_source_code, ChatType
-from .storage import save_answers, create_chat_hist, read_file, dump_data
+from .utils import terminal_width, print_tag_args, print_chat_hist, ChatType
+from .storage import save_answers, create_chat_hist
 from .api_client import ai, openai_api_key, print_models
 from .configuration import Config
 from .chat import ChatDB
-from .message import Message, MessageFilter
+from .message import Message, MessageFilter, MessageError
 from itertools import zip_longest
 from typing import Any
 
@@ -128,18 +127,13 @@ def print_cmd(args: argparse.Namespace, config: Config) -> None:
     Handler for the 'print' command.
     """
     fname = Path(args.file)
-    if fname.suffix == '.yaml':
-        with open(args.file, 'r') as f:
-            data = yaml.load(f, Loader=yaml.FullLoader)
-    elif fname.suffix == '.txt':
-        data = read_file(fname)
-    else:
-        print(f"Unknown file type: {args.file}")
+    try:
+        message = Message.from_file(fname)
+        if message:
+            print(message.to_str(source_code_only=args.source_code_only))
+    except MessageError:
+        print(f"File is not a valid message: {args.file}")
         sys.exit(1)
-    if args.source_code_only:
-        display_source_code(data['answer'])
-    else:
-        print(dump_data(data).strip())
 
 
 def create_parser() -> argparse.ArgumentParser:
@@ -223,11 +217,11 @@ def create_parser() -> argparse.ArgumentParser:
 
     # 'print' command parser
     print_cmd_parser = cmdparser.add_parser('print',
-                                            help="Print files.",
+                                            help="Print message files.",
                                             aliases=['p'])
     print_cmd_parser.set_defaults(func=print_cmd)
     print_cmd_parser.add_argument('-f', '--file', help='File to print', required=True)
-    print_cmd_parser.add_argument('-S', '--source-code-only', help='Print only source code',
+    print_cmd_parser.add_argument('-S', '--source-code-only', help='Print source code only (from the answer, if available)',
                                   action='store_true')
 
     argcomplete.autocomplete(parser)