Abstract: A method and system are disclosed for automated context-sensitive message organization. The method in the disclosed embodiments substantially includes determining a logical correlation between a message identifier and a message file. The method may also include scanning a source code file to identify a reference to the message identifier and the associated context of the reference. In a further embodiment, the method includes analyzing source code file and message file based on a context of the identified reference in accordance with a predetermined analysis rule. Additionally, the method may include generating an output based on a result of the analysis.