diff -Naur psi-0.10-orig/iconsets/system/default/edittrash.png psi-0.10/iconsets/system/default/edittrash.png
--- psi-0.10-orig/iconsets/system/default/edittrash.png	1970-01-01 00:00:00.000000000 +0000
+++ psi-0.10/iconsets/system/default/edittrash.png	2006-01-14 00:47:06.000000000 +0000
@@ -0,0 +1,5 @@
+‰PNG
+
+   IHDR         óÿa   gAMA  ±Ž|ûQ“    cHRM  z%  €ƒ  ùÿ  €è  u0  ê`  :—  o—©™Ô  FIDAT8mS=oA‹ïp°!&©ˆ"°äÿ iþ¡¶(é ùü“„’ŠÉR$+2J‘ !ì‚;ûlß÷íÝ.oö°CÖ~·£ÓÎÛ™÷æ¥]®^¯÷Rˆô¡ïªçÍ?†aôMñÙ²¬tÿÕ;º²&8Þ×kµŽm;4›OÉ÷}šOg4÷J’˜<ß£™ëÚ»/^¿]&Xë÷ûêþÎNg8êd!2J“”²\’’9Ž(Ê%bE[ggß÷öž©‚Á`@år™Ì’I9’ò<')°s{ˆQ¦ŽÃ 4Ç^iÁL…ÇÇ_Öj6›¨@ëºÀ”lû7¥iJ•É„&—¢8¾*™y–}È¥z2èüâ‚²L„£(ŠÐ»v$O ‹G167·VÖºÝnçëÉ	ÄJÐÊ:YÖHK ‚q¢‰ŽãPåf…ŽŽ~´Z-j·Û´»ûýK*•JZ—j­FõúmZú]®E]]š€“¸<†žþ+	á¤Þëõ:mßÛþ/YkÀNâ2¹lŽì„Ä\aa\Õõøyž·D ØÊà÷1Š÷k	”,`,¥‚ðR'©QÌF±†Á9Ù
+îÃÎµçEKR'ÈS˜åúfviQÁS`ü ~š‹+)BJâèŸˆ²aÖ@[
+ò¬¨ðÎ€OÚ…’i>á[ðAÂØ2Ž`6›Ñxì(w:}ƒãìe œ¿ô×ˆ¾–[²€[@X'ú+×Ü§ð\«?¢š¬ŠÜ¼Ý    IEND®B`‚
\ Brak znaku nowej linii na koñcu pliku
diff -Naur psi-0.10-orig/src/groupchatdlg.cpp psi-0.10/src/groupchatdlg.cpp
--- psi-0.10-orig/src/groupchatdlg.cpp	2006-01-14 00:44:48.000000000 +0000
+++ psi-0.10/src/groupchatdlg.cpp	2006-01-14 00:50:53.000000000 +0000
@@ -80,6 +80,7 @@
 	BookmarkList bookmarks;
 	Jid jid, inviteFrom;
 	bool isJoining;
+	bool isPrefilled;
 };
 
 GCJoinDlg::GCJoinDlg(PsiCon *psi, PsiAccount *pa)
@@ -91,6 +92,7 @@
 	d->psi->dialogRegister(this);
 	d->busy = busy;
 	d->isJoining = false;
+	d->isPrefilled = false;
 
 	updateIdentity(pa);
 
@@ -329,21 +331,25 @@
 void GCJoinDlg::setHost(const QString &h)
 {
 	le_host->setText(h);
+	d->isPrefilled = true;
 }
 
 void GCJoinDlg::setRoom(const QString &r)
 {
 	le_room->setText(r);
+	d->isPrefilled = true;
 }
 
 void GCJoinDlg::setNick(const QString &n)
 {
 	le_nick->setText(n);
+	d->isPrefilled = true;
 }
 
 void GCJoinDlg::setPassword(const QString &p)
 {
 	le_password->setText(p);
+	d->isPrefilled = true;
 }
 
 void GCJoinDlg::setInvite(const Jid &from)
@@ -472,8 +478,11 @@
 
 	if(!d->isJoining) {
 		enableWidgets(true);
-		bookmarks_activated(0);
+		if (!d->isPrefilled) {
+			bookmarks_activated(0);
+		}
 	}
+	d->isPrefilled = false;
 
 	if(!d->isJoining)
 		d->busy->stop();
diff -Naur psi-0.10-orig/src/psiaccount.cpp psi-0.10/src/psiaccount.cpp
--- psi-0.10-orig/src/psiaccount.cpp	2006-01-14 00:44:48.000000000 +0000
+++ psi-0.10/src/psiaccount.cpp	2006-01-14 00:52:51.000000000 +0000
@@ -4028,8 +4028,8 @@
 	d->bookmarks = task->bookmarks();
 
 	if(!task->success()) {
-		QMessageBox::information(NULL, tr("Error"),
-					 tr("Psi was unable to retrieve your bookmarks."));
+//		QMessageBox::information(NULL, tr("Error"),
+//					 tr("Psi was unable to retrieve your bookmarks."));
 		return;
 	}