adding feature to track external message IDs