diff --git a/goss-restorethread.rb b/goss-restorethread.rb
index 24f656b..38ef5f0 100644
--- a/goss-restorethread.rb
+++ b/goss-restorethread.rb
@@ -1047,7 +1047,8 @@ class GossamerForumsImporter < ImportScripts::Base
 
     # Remove the [signature] as we don't support this in Discourse
 #    sanitized_message.sub!(/\n?\[signature\]\n?\z/, '')
-    sanitized_message.gsub(/\n?\[signature\]\n?/, '')
+#    sanitized_message.gsub(/\n?\[signature\]\n?/, '')
+    sanitized_message.gsub!(/[\r\n]*\[signature\][\r\n]*/, '')
 
     # Ensure minimum length
     if sanitized_message.strip.empty? || sanitized_message.length < 5