diff --git a/doc/ChangeLog b/doc/ChangeLog
index f27e7e4c7c..8af5d9093c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-18	Evgeny V. Kokovikhin
+	
+	* main/Messages/TextMessage.class.php, main/Messages/TextFileReceiver.class.php :
+	a bit optimize: don't needed to make Timestamp twice
+
 2011-11-14      Dmitry V. Snezhinskiy
 	
 	* main/Utils/AMQP/Pecl/AMQPPeclChannel.class.php :
diff --git a/main/Messages/TextFileReceiver.class.php b/main/Messages/TextFileReceiver.class.php
index a249bf33b9..8a6b7e1d89 100644
--- a/main/Messages/TextFileReceiver.class.php
+++ b/main/Messages/TextFileReceiver.class.php
@@ -69,8 +69,7 @@ public function receive($uTimeout = null)
 			
 			Assert::isNotNull($time);
 			
-			$result = TextMessage::create()->
-				setTimestamp(Timestamp::create($time))->
+			$result = TextMessage::create(Timestamp::create($time))->
 				setText($text);
 			
 			return $result;
diff --git a/main/Messages/TextMessage.class.php b/main/Messages/TextMessage.class.php
index f40b6fbad0..4fba2aaf63 100644
--- a/main/Messages/TextMessage.class.php
+++ b/main/Messages/TextMessage.class.php
@@ -15,17 +15,17 @@ final class TextMessage implements Message
 		private $timestamp	= null;
 		private $text		= null;
 
-		public static function create()
+		public static function create(Timestamp $timestamp = null)
 		{
-			return new self;
+			return new self($timestamp);
 		}
 
-		public function __construct()
+		public function __construct(Timestamp $timestamp = null)
 		{
-			$this->timestamp = Timestamp::makeNow();
+			$this->timestamp = $timestamp ?: Timestamp::makeNow();
 		}
 
-		public function setTimestamp($timestamp)
+		public function setTimestamp(Timestamp $timestamp)
 		{
 			$this->timestamp = $timestamp;