diff --git a/core/i18nTextCollector.php b/core/i18nTextCollector.php
index 7d3b1d52a..560f025b1 100644
--- a/core/i18nTextCollector.php
+++ b/core/i18nTextCollector.php
@@ -181,6 +181,7 @@ class i18nTextCollector extends Object {
 			'([[:space:]]*,[[:space:]]*[^,)]*)?([[:space:]]*,' . // priority (optional)
 			'[[:space:]]*("([^"]|\\\")*"|\'([^\']|\\\\\')*\'))?[[:space:]]*' . // comment (optional)
 		'\)';
+		
 		while (ereg($regexRule, $content, $regs)) {
 			$entitiesArr = array_merge($entitiesArr, (array)$this->entitySpecFromRegexMatches($regs));
 			
@@ -282,13 +283,19 @@ class i18nTextCollector extends Object {
 		
 		// remove wrapping quotes
 		$value = ($regs[2]) ? substr($regs[2],1,-1) : null;
-		
-		$value = ereg_replace("([^\\])['\"][[:space:]]*.[[:space:]]*['\"]",'\\1',$value);
+
+		$value = ereg_replace("([^\\])['\"][[:space:]]*\.[[:space:]]*['\"]",'\\1',$value);
 
 		// only escape quotes when wrapped in double quotes, to make them safe for insertion
 		// into single-quoted PHP code. If they're wrapped in single quotes, the string should
 		// be properly escaped already
-		if(substr($regs[2],0,1) == '"') $value = addcslashes($value,'\'');
+		if(substr($regs[2],0,1) == '"') {
+			// Double quotes don't need escaping
+			$value = str_replace('\\"','"', $value);
+			// But single quotes do
+			$value = str_replace("'","\\'", $value);
+		}
+
 		
 		// remove starting comma and any newlines
 		$prio = ($regs[10]) ? trim(preg_replace('/\n/','',substr($regs[10],1))) : null;
diff --git a/tests/i18n/i18nTextCollectorTest.php b/tests/i18n/i18nTextCollectorTest.php
index 4fd646bb2..08a7c7d97 100644
--- a/tests/i18n/i18nTextCollectorTest.php
+++ b/tests/i18n/i18nTextCollectorTest.php
@@ -70,17 +70,23 @@ class i18nTextCollectorTest extends SapphireTest {
 		$php = <<<PHP
 _t(
 'Test.CONCATENATED',
-'Line 1' .
-'Line 2' .
-'Line 3',
+'Line 1 and ' .
+'Line \'2\' and ' .
+'Line "3"',
 PR_MEDIUM,
 'Comment'
 );
+
+_t(
+'Test.CONCATENATED2',
+"Line \"4\" and " . 
+"Line 5");
 PHP;
 		$this->assertEquals(
 			$c->collectFromCode($php, 'mymodule'),
 			array(
-				'Test.CONCATENATED' => array("Line 1Line 2Line 3",'PR_MEDIUM','Comment')
+				'Test.CONCATENATED' => array("Line 1 and Line \\'2\\' and Line \"3\"",'PR_MEDIUM','Comment'),
+				'Test.CONCATENATED2' => array("Line \"4\" and Line 5",null,null)
 			)
 		);
 	}