X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fpop3client%2Fserv_pop3client.c;h=764293c317eb8e80b548b7de0296cd16c964316e;hb=950fb0db5169e42074bf351f4d2b6ff86d424fca;hp=3d1c1dd8f45f384781df03fc184bd0a88ab2078d;hpb=9238afa2572989d7b10a5d2d59e44145c613504d;p=citadel.git

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 3d1c1dd8f..764293c31 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -1067,11 +1067,15 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
 									&lPtr,
 									'|');
 
-				StrBufPrintf(cptr->Url, "pop3://%s:%s@%s/%s",
-					     ChrPtr(cptr->pop3user),
-					     ChrPtr(cptr->pop3pass),
-					     ChrPtr(Tmp),
-					     ChrPtr(cptr->RoomName));
+				StrBufAppendBufPlain(cptr->Url, HKEY("pop3://"), 0);
+				StrBufUrlescAppend(cptr->Url, cptr->pop3user, NULL);
+				StrBufAppendBufPlain(cptr->Url, HKEY(":"), 0);
+				StrBufUrlescAppend(cptr->Url, cptr->pop3pass, NULL);
+				StrBufAppendBufPlain(cptr->Url, HKEY("@"), 0);
+				StrBufAppendBuf(cptr->Url, Tmp, 0);
+				StrBufAppendBufPlain(cptr->Url, HKEY("/"), 0);
+				StrBufUrlescAppend(cptr->Url, cptr->RoomName, NULL);
+
 				FreeStrBuf(&Tmp);
 				ParseURL(&cptr->IO.ConnectMe, cptr->Url, 110);