diff --git a/Urcheon/Bsp.py b/Urcheon/Bsp.py
index d0d1a8e..b12a856 100644
--- a/Urcheon/Bsp.py
+++ b/Urcheon/Bsp.py
@@ -139,6 +139,9 @@ def printSoundList(self):
 		print("")
 		return True
 
+	def printStringList(self):
+		self.entities_as_map.printStringList()
+
 	def substituteKeywords(self, substitution):
 		self.entities_as_map.substituteKeywords(substitution)
 
@@ -792,6 +795,7 @@ def add_arguments(parser):
 	parser.add_argument("-ls", "--list-sounds", help="list sounds", action="store_true")
 	parser.add_argument("-lt", "--list-textures", help="list textures", action="store_true")
 	parser.add_argument("-ll", "--list-lightmaps", help="list lightmaps", action="store_true")
+	parser.add_argument("-lS", "--list-strings", help="list strings", action="store_true")
 	parser.add_argument("-pe", "--print-entities", help="print entities", action="store_true")
 
 def main(args=None):
@@ -906,6 +910,12 @@ def main(args=None):
 		else:
 			Ui.error("Entities lump missing")
 
+	if args.list_strings:
+		if not entities.isEmpty():
+			entities.printStringList()
+		else:
+			Ui.error("Entities lump missing")
+
 	if args.print_entities:
 		if not entities.isEmpty():
 			entities.printString()
diff --git a/Urcheon/Map.py b/Urcheon/Map.py
index 1ba7285..4c3e868 100644
--- a/Urcheon/Map.py
+++ b/Urcheon/Map.py
@@ -217,11 +217,14 @@ def readBlob(self, map_bstring):
 		# }
 		block_ending_pattern = re.compile(r"^[ \t]*}[ \t]*$")
 
+		line_num = 0
 		entity_num = -1
 
 		for line in map_lines:
 			debug("Reading: " + line)
 
+			line_num += 1
+
 			# Empty lines
 			if empty_line_pattern.match(line):
 				debug("Empty line")
@@ -257,6 +260,7 @@ def readBlob(self, map_bstring):
 						self.entity_list[-1].thing_list.append(KeyValue())
 						self.entity_list[-1].thing_list[-1].key = key
 						self.entity_list[-1].thing_list[-1].value = value
+						self.entity_list[-1].thing_list[-1].line_num = line_num
 						continue
 
 					# Shape start
@@ -678,6 +682,14 @@ def writeBspEntities(self, file_name):
 			bsp_entities_file.write(str.encode(bsp_entities_string))
 			bsp_entities_file.close()
 
+	def printStringList(self):
+		for entity in self.entity_list:
+			found = False
+			for thing in entity.thing_list:
+				if isinstance(thing, KeyValue):
+					if thing.key.lower() == "message":
+						print(str(thing.line_num) + ": " + thing.value)
+
 	def substituteKeywords(self, substitution):
 		if not self.entity_list:
 			Ui.error("No map loaded")
@@ -727,6 +739,7 @@ class KeyValue():
 	def __init__(self):
 		self.key = ""
 		self.value = ""
+		self.line_num = 0
 
 class Shape():
 	pass
@@ -789,6 +802,7 @@ def add_arguments(parser):
 	parser.add_argument("-oe", "--output-bsp-entities", dest="output_bsp_entities", metavar="FILENAME", help="dump entities to .bsp entities format to .txt file %(metavar)s")
 	parser.add_argument("-sk", "--substitute-keywords", dest="substitute_keywords", metavar="FILENAME", help="use entity keyword substitution rules from .csv file %(metavar)s")
 	parser.add_argument("-Lf", "--lowercase-filepaths", dest="lowercase_filepaths", help="lowercase file paths", action="store_true")
+	parser.add_argument("-lS", "--list-strings", help="list strings", action="store_true")
 	parser.add_argument("-dn", "--disable-numbering", dest="disable_numbering", help="disable entity and shape numbering", action="store_true")
 	parser.add_argument("-om", "--output-map", dest="output_map_file", metavar="FILENAME", help="write to .map file %(metavar)s")
 
@@ -815,6 +829,9 @@ def main(args=None):
 	if args.lowercase_filepaths:
 		map.lowerCaseFilePaths()
 
+	if args.list_strings:
+		map.printStringList()
+
 	if args.disable_numbering:
 		map.numbering_enabled = False