diff --git a/plugins/BadWords/plugin.py b/plugins/BadWords/plugin.py
index 7025837ed..6157b6600 100644
--- a/plugins/BadWords/plugin.py
+++ b/plugins/BadWords/plugin.py
@@ -64,6 +64,20 @@ class BadWords(callbacks.Privmsg):
 
     def inFilter(self, irc, msg):
         self.filtering = True
+        # We need to check for bad words here rather than in doPrivmsg because
+        # messages don't get to doPrivmsg is the user is ignored.
+        if msg.command == 'PRIVMSG':
+            self.updateRegexp()
+            s = ircutils.stripFormatting(msg.args[1])
+            channel = msg.args[0]
+            if ircutils.isChannel(channel) and self.registryValue('kick', channel):
+                if self.regexp.search(s):
+                    if irc.nick in irc.state.channels[channel].ops:
+                        message = self.registryValue('kick.message', channel)
+                        irc.queueMsg(ircmsgs.kick(channel, msg.nick, message))
+                    else:
+                        self.log.warning('Should kick %s from %s, but not opped.',
+                                         msg.nick, channel)
         return msg
 
     def updateRegexp(self):
@@ -81,19 +95,6 @@ class BadWords(callbacks.Privmsg):
             msg = ircmsgs.privmsg(msg.args[0], s, msg=msg)
         return msg
 
-    def doPrivmsg(self, irc, msg):
-        self.updateRegexp()
-        s = ircutils.stripFormatting(msg.args[1])
-        channel = msg.args[0]
-        if ircutils.isChannel(channel) and self.registryValue('kick', channel):
-            if self.regexp.search(s):
-                if irc.nick in irc.state.channels[channel].ops:
-                    message = self.registryValue('kick.message', channel)
-                    irc.queueMsg(ircmsgs.kick(channel, msg.nick, message))
-                else:
-                    self.log.warning('Should kick %s from %s, but not opped.',
-                                     msg.nick, channel)
-
     def makeRegexp(self, iterable):
         s = '(%s)' % '|'.join(map(re.escape, iterable))
         if self.registryValue('requireWordBoundaries'):
diff --git a/plugins/RSS/our_feedparser.py b/plugins/RSS/our_feedparser.py
old mode 100755
new mode 100644