diff --git a/TelegramBotBase/Form/AutoCleanForm.cs b/TelegramBotBase/Form/AutoCleanForm.cs
index 18c32d1..099a057 100644
--- a/TelegramBotBase/Form/AutoCleanForm.cs
+++ b/TelegramBotBase/Form/AutoCleanForm.cs
@@ -21,15 +21,33 @@ namespace TelegramBotBase.Form
 
         public enum eDeleteMode
         {
+            /// <summary>
+            /// Don't delete any message.
+            /// </summary>
             None = 0,
+            /// <summary>
+            /// Delete messages on every callback/action.
+            /// </summary>
             OnEveryCall = 1,
+            /// <summary>
+            /// Delete on leaving this form.
+            /// </summary>
             OnLeavingForm = 2
         }
 
         public enum eSide
         {
+            /// <summary>
+            /// Delete only messages from this bot.
+            /// </summary>
             BotOnly = 0,
+            /// <summary>
+            /// Delete only user messages.
+            /// </summary>
             UserOnly = 1,
+            /// <summary>
+            /// Delete all messages in this context.
+            /// </summary>
             Both = 2
         }
 
diff --git a/TelegramBotBase/Sessions/DeviceSession.cs b/TelegramBotBase/Sessions/DeviceSession.cs
index aac08a4..6453010 100644
--- a/TelegramBotBase/Sessions/DeviceSession.cs
+++ b/TelegramBotBase/Sessions/DeviceSession.cs
@@ -83,7 +83,7 @@ namespace TelegramBotBase.Sessions
             }
         }
 
-        public EventHandlerList __Events = new EventHandlerList();
+        private EventHandlerList __Events = new EventHandlerList();
 
         private static object __evMessageSent = new object();
         private static object __evMessageReceived = new object();
@@ -138,6 +138,39 @@ namespace TelegramBotBase.Sessions
             return null;
         }
 
+        /// <summary>
+        /// Edits the text message
+        /// </summary>
+        /// <param name="messageId"></param>
+        /// <param name="text"></param>
+        /// <param name="buttons"></param>
+        /// <returns></returns>
+        public async Task<Message> Edit(Message message, ButtonForm buttons = null)
+        {
+            if (this.ActiveForm == null)
+                return null;
+
+            InlineKeyboardMarkup markup = null;
+            if (buttons != null)
+            {
+                markup = buttons;
+            }
+
+            try
+            {
+                var m = await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, message.MessageId, message.Text, replyMarkup: markup);
+
+                return m;
+            }
+            catch
+            {
+
+            }
+
+
+            return null;
+        }
+
         /// <summary>
         /// Sends a simple text message
         /// </summary>
@@ -163,7 +196,7 @@ namespace TelegramBotBase.Sessions
             {
                 m = await (this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, text, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
 
-                OnMessageSent(new MessageSentEventArgs( m));
+                OnMessageSent(new MessageSentEventArgs(m));
             }
             catch (ApiRequestException ex)
             {
@@ -330,7 +363,7 @@ namespace TelegramBotBase.Sessions
             }
 
             var m = await this.Client.TelegramClient.SendDocumentAsync(this.DeviceId, document, caption, replyMarkup: markup, disableNotification: disableNotification, replyToMessageId: replyTo);
-            
+
             OnMessageSent(new MessageSentEventArgs(m));
 
             return m;
@@ -384,7 +417,7 @@ namespace TelegramBotBase.Sessions
             try
             {
                 await this.Client.TelegramClient.DeleteMessageAsync(this.DeviceId, messageId);
-                
+
                 return true;
             }
             catch (ApiRequestException ex)