  
      # Call the message callback if it's defined.
      if( defined $self->message_function) {
-@@ -786,9 +793,37 @@
++        $watchdog = $watchdog_default; # Reset watchdog on every new message
++        
+         $self->message_function->(bot_object => $self,
+                                   from_full => $from_full,
+                                   body => $body,
+@@ -786,9 +797,37 @@
      my $from = $presence->GetFrom();
      $from = "." if(!defined $from);
  

 # Initialize this hour's message count.
 has 'messages_sent_today'     => (isa => 'HashRef', is => 'ro', default => sub{{(localtime)[7] => {(localtime)[2] => 0}}});
 
@@ -294,6 +299,18 @@
 
 safetey: 166
 

 
 =cut
 
@@ -989,7 +1029,8 @@
 
     # Strip out anything that's not a printable character
     # Now with unicode support?
