diff --git a/plugins/Aka/test.py b/plugins/Aka/test.py
index 9f813ead0..789949490 100644
--- a/plugins/Aka/test.py
+++ b/plugins/Aka/test.py
@@ -55,7 +55,15 @@ class FunctionsTest(SupyTestCase):
 
 class AkaChannelTestCase(ChannelPluginTestCase):
     plugins = ('Aka', 'Conditional', 'Filter', 'Math', 'Utilities',
-            'Format', 'Reply')
+            'Format', 'Reply', 'String')
+
+    def testHistsearch(self):
+        self.assertNotError(
+                r'aka add histsearch "last --from [cif true '
+                r'\"echo test\" \"echo test\"] '
+                r'--regexp [concat \"m/$1/\" [re s/g// \"@2\"]]"')
+        self.assertResponse('echo foo', 'foo')
+        self.assertResponse('histsearch .*', '@echo foo')
 
     def testDoesNotOverwriteCommands(self):
         # We don't have dispatcher commands anymore
diff --git a/plugins/Conditional/plugin.py b/plugins/Conditional/plugin.py
index 69ddf0579..dc58ed4bc 100644
--- a/plugins/Conditional/plugin.py
+++ b/plugins/Conditional/plugin.py
@@ -83,7 +83,6 @@ class Conditional(callbacks.Plugin):
             self._runCommandFunction(irc, msg, ifcommand)
         else:
             self._runCommandFunction(irc, msg, elsecommand)
-        irc.noReply()
     cif = wrap(cif, [boolean_or_int, 'something', 'something'])
 
     @internationalizeDocstring