Hi, This patch changes the locking in the tracking sms to be conditional. This change will make it easier to disable locking altogether in this sms. As a side effect apr_sms_tracking_destroy() is a lot cleaner. Also removed an unneeded #include. Sander