diff -Naur psi-0.10-orig/iconsets/system/default/edit.png psi-0.10/iconsets/system/default/edit.png
--- psi-0.10-orig/iconsets/system/default/edit.png	1970-01-01 00:00:00.000000000 +0000
+++ psi-0.10/iconsets/system/default/edit.png	2006-01-14 01:58:18.000000000 +0000
@@ -0,0 +1,7 @@
+‰PNG
+
+   IHDR         óÿa   	pHYs    ÒÝ~ü   tIMEÒ
+íÇƒ   bKGD ÿ ÿ ÿ ½§“  OIDAT8Ë•’KH”Q†Ÿóÿ¿ŒÒ#(ƒÀ‚ ÚH¥®¬E:F¥» M[­¥E«MXF¨Ñ¦ˆ.iISfMAš19‰I#c¢&xÉÛäüÎÌùÏ9-ÆË˜CÐïûœ÷|Ž1¦
+xÖÔ5ü£ÁÛvˆ'7jØRPH]õ.·¤ÒŸç mË¢3þÝ¤¤F*ÃoW’’šÉÙŽcCfb¸¿ôñåšŽ’
+^´£Ë !B,a°-m	|>¥ÒÃ:v{uç:Ëüå¶ßAy‹8jLZl	°m-
+Co_?‡¼vŽœ(gðuÚ¬“¬è¥$l[ Œ!Çh­9ìûHqåQ¢F´JàÆ5_fÖŒ^ÍQ~Ý±aºëÅe¥¼¸	BãÆ5¡È4¯"kÊd|„Hw¾c§¿Š¡—±pXXpù™¥¹c€ÉØbã€Ö ´AJEÊÓÈø<Ûòaî{/?‡FˆÇ6Ð÷c‚»†›u¯ µk )O#=¤gÈ3ó$g\ÂŸºy×ad>E¸wœ¢“ j!KˆŽmá&<’SÃlÎÓÙöœ·¡Þô°goõnÓô´gUŸi¶$=ÍbRÒÚrŸ©ZÞwS¸o?Wo]Bø¶â™Jf ¤¤&Ú×Åõ†&**sþb=&gã¿f™Ÿe.cjô[v€Ò†D"Á×pˆkõM¸Ò¢?Eiƒçi”6+‹– (r¨>}©ÌŠQ*ƒôjé.<–› =•±UKy6«›º†Cüoýe7_©N    IEND®B`‚
\ Brak znaku nowej linii na koñcu pliku
diff -Naur psi-0.10-orig/iconsets/system/default/icondef.xml psi-0.10/iconsets/system/default/icondef.xml
--- psi-0.10-orig/iconsets/system/default/icondef.xml	2006-01-14 01:55:55.000000000 +0000
+++ psi-0.10/iconsets/system/default/icondef.xml	2006-01-14 01:59:06.000000000 +0000
@@ -276,6 +276,11 @@
 	</icon>
 
 	<icon>
+		<x xmlns='name'>psi/edit</x>
+		<object mime='image/png'>edit.png</object>
+	</icon>
+
+	<icon>
 		<x xmlns='name'>psi/close</x>
 		<object mime='image/png'>close.png</object>
 	</icon>
diff -Naur psi-0.10-orig/iris/include/im.h psi-0.10/iris/include/im.h
--- psi-0.10-orig/iris/include/im.h	2006-01-14 01:55:55.000000000 +0000
+++ psi-0.10/iris/include/im.h	2006-01-14 02:00:09.000000000 +0000
@@ -137,7 +137,7 @@
 
 		// JEP-0091
 		QDateTime timeStamp() const;
-		void setTimeStamp(const QDateTime &ts);
+		void setTimeStamp(const QDateTime &ts, const bool send = false);
 
 		// JEP-0066
 		UrlList urlList() const;
diff -Naur psi-0.10-orig/iris/xmpp-im/types.cpp psi-0.10/iris/xmpp-im/types.cpp
--- psi-0.10-orig/iris/xmpp-im/types.cpp	2006-01-14 01:55:55.000000000 +0000
+++ psi-0.10/iris/xmpp-im/types.cpp	2006-01-14 02:11:00.000000000 +0000
@@ -279,6 +279,7 @@
 	// extensions
 	int muc_status;
 	QDateTime timeStamp;
+	bool timeStampSend;
 	UrlList urlList;
 	AddressList addressList;
 	QValueList<MsgEvent> eventList;
@@ -299,6 +300,7 @@
 {
 	d = new Private;
 	d->to = to;
+	d->timeStampSend = false;
 	d->spooled = false;
 	d->wasEncrypted = false;
 	d->evil = false;
@@ -519,9 +521,10 @@
 	return d->timeStamp;
 }
 
-void Message::setTimeStamp(const QDateTime &ts)
+void Message::setTimeStamp(const QDateTime &ts, const bool send)
 {
 	d->timeStamp = ts;
+	d->timeStampSend = send;
 }
 
 //! \brief Return list of urls attached to message.
@@ -725,11 +728,11 @@
 		s.setError(d->error);
 
 	// timestamp
-	/*if(!d->timeStamp.isNull()) {
+	if((d->timeStampSend)&&(!d->timeStamp.isNull())) {
 		QDomElement e = s.createElement("jabber:x:delay", "x");
 		e.setAttribute("stamp", TS2stamp(d->timeStamp));
 		s.appendChild(e);
-	}*/
+	}
 
 	// MUC
 	if(mucStatus() != 0 || !d->invitationTo.isEmpty()) {
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 01:55:56.000000000 +0000
+++ psi-0.10/src/psiaccount.cpp	2006-01-14 02:14:15.000000000 +0000
@@ -3684,6 +3684,7 @@
 		if (oTo.count() == 0)
 			m.addressAdd(Address(OriginalTo, m.to()));
 
+		m.setTimeStamp(m.timeStamp(), true);
 		m.setTo(jid);
 		m.setFrom("");
 
