Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r537 -r553
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 537)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 553)
@@ -205,7 +205,7 @@
     function SendToUser($UserId)
     {
         global $objUsers, $objEmailQueue, $objConfig;
-
+		
         $conn = &GetADODBConnection();
         //echo "Handling Event ".$this->Get("Event")." for user $UserId <br>\n";
         $this->recipient = new clsPortalUser($UserId); // $objUsers->GetItem($UserId);
@@ -217,10 +217,10 @@
           $To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName"));
 
           $this->ReadTemplate();
-          
+
           $subject = $this->ParseSection($this->subject, $this->recipient);
           $body = $this->ParseSection($this->body);
-
+          
           if(!is_object($this->fromuser))
           {
               $this->fromuser = $objUsers->GetItem($this->Get("FromUserId"));
@@ -307,9 +307,10 @@
     function ParseTemplateText($text)
     {
       $html = $text;
-      $search = "<inp:".$this->TagPrefix;
-      $next_tag = strpos($html,"<inp:");
-      //$next_tag = strpos($html,$search);
+      $search = "<inp:";
+      //$search = "<inp:".$this->TagPrefix;
+      //$next_tag = strpos($html,"<inp:");
+      $next_tag = strpos($html,$search);
       
       while($next_tag)
       {