- (*i).erase((*i).find("@"));\r
- }\r
- */\r
- // only erase after @ if message is old type with @freenetproject.org\r
- if((*i).find("@freenetproject.org")!=std::string::npos)\r
- {\r
- (*i).erase((*i).find("@"));\r
- }\r
- if((*i)!="")\r
- {\r
- m_inreplyto[count++]=(*i);\r
+ // get rid of < and > and any whitespace\r
+ (*i)=StringFunctions::Replace((*i),"<","");\r
+ (*i)=StringFunctions::Replace((*i),">","");\r
+ (*i)=StringFunctions::TrimWhitespace((*i));\r
+ /*\r
+ // erase @ and everything after\r
+ if((*i).find("@")!=std::string::npos)\r
+ {\r
+ (*i).erase((*i).find("@"));\r
+ }\r
+ */\r
+ // only erase after @ if message is old type with @freenetproject.org\r
+ if((*i).find("@freenetproject.org")!=std::string::npos)\r
+ {\r
+ (*i).erase((*i).find("@"));\r
+ }\r
+ if((*i)!="")\r
+ {\r
+ m_inreplyto[count++]=(*i);\r
+ }\r