diff --git a/mycroft_bus_client/message.py b/mycroft_bus_client/message.py
index 48351ca..037e3e3 100644
--- a/mycroft_bus_client/message.py
+++ b/mycroft_bus_client/message.py
@@ -146,9 +146,7 @@ class Message:
         Returns
             (Message) message with the type modified to match default response
         """
-        response_message = Message(self.msg_type + '.response', data or {},
-                                   context or self.context)
-        return response_message
+        return self.reply(self.msg_type + '.response', data, context)
 
     def publish(self, msg_type, data, context=None):
         """

diff --git a/test/test_message.py b/test/test_message.py
index b1f2077..67d2939 100644
--- a/test/test_message.py
+++ b/test/test_message.py
@@ -40,6 +40,23 @@ class TestMessage(TestCase):
         self.assertEqual(response_msg.data, {})
         self.assertEqual(response_msg.context, source.context)
 
+    def test_reply(self):
+        """Assert that the source and destination are swapped"""
+        source = Message('test_type',
+                         data={'robot': 'marvin', 'android': 'data'},
+                         context={'source': 'earth',
+                                  'destination': 'alpha centauri'})
+
+        reply_msg = source.reply('reply_type')
+        self.assertEqual(reply_msg.context["source"],
+                         source.context["destination"])
+        self.assertEqual(reply_msg.context["destination"],
+                         source.context["source"])
+
+        # assert that .response calls .reply internally as stated in docstrings
+        response_msg = source.response()
+        self.assertEqual(response_msg.context, reply_msg.context)
+
     def test_dig_for_message_simple(self):
         test_msg = Message("test message", {"test": "data"}, {"time": time()})
         self.assertEqual(test_msg, get_message_standard(test_msg))

message.response should use message.reply internally
to account for proper message routing https://github.com/JarbasHiveMind/HiveMind-core/wiki/Mycroft-Messages + https://github.com/MycroftAI/mycroft-core/pull/2461
test/test_message.py::TestMessage::test_reply
test/test_message.py::TestMessage::test_dig_for_message_nested test/test_message.py::TestMessage::test_response test/test_message.py::TestMessage::test_dig_for_message_simple test/test_message.py::TestMessage::test_serialize_deserialize test/test_message.py::TestMessage::test_dig_for_message_no_method_call test/test_message.py::TestMessage::test_dig_for_message_invalid_type