diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage..st
new file mode 100644
index 000000000..7dae32ba3
--- /dev/null
+++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage..st
@@ -0,0 +1,5 @@
+sending
+sendPollMessage: aPoll
+
+	self core send: (TCCRequest newSendPollMessage: aPoll to: self id).
+	self selectedReplyToMessageId: self class defaultSelectedReplyToMessageId.
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage.asking.with.isAnonymous..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage.asking.with.isAnonymous..st
new file mode 100644
index 000000000..d3cda6248
--- /dev/null
+++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/sendPollMessage.asking.with.isAnonymous..st
@@ -0,0 +1,5 @@
+sending
+sendPollMessage: aPollType asking: aString with: anOrderedCollection isAnonymous: aBoolean
+
+	self core send: (TCCRequest newSendPollMessage: aPollType to: (self id) asking: aString with: anOrderedCollection isAnonymous: aBoolean).
+	self selectedReplyToMessageId: self class defaultSelectedReplyToMessageId.
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json
index 22d1887e1..087323e93 100644
--- a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json
+++ b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json
@@ -76,6 +76,8 @@
 		"sendDocumentMessage:" : "ED 6/19/2024 13:53",
 		"sendMessage:" : "JK 5/28/2024 09:53",
 		"sendPhotoMessage:" : "ED 6/19/2024 12:11",
+		"sendPollMessage:" : "7/5/2024 09:48:19",
+		"sendPollMessage:asking:with:isAnonymous:" : "jkon 6/27/2024 20:35",
 		"sendStickerMessage:" : "JK 5/28/2024 10:26",
 		"sendVideoMessage:" : "ED 6/19/2024 12:23",
 		"stillRequestedMessages" : "ek 8/4/2022 11:38",
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/class/extractPathFrom..st b/packages/TelegramClient-Core.package/TCCImageStore.class/class/extractPathFrom..st
deleted file mode 100644
index 276d1b715..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/class/extractPathFrom..st
+++ /dev/null
@@ -1,4 +0,0 @@
-utility
-extractPathFrom: anEvent
-	
-	^ (anEvent at: 'local') at: 'path'
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/class/imageFormFrom..st b/packages/TelegramClient-Core.package/TCCImageStore.class/class/imageFormFrom..st
deleted file mode 100644
index 01f1dc7a4..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/class/imageFormFrom..st
+++ /dev/null
@@ -1,4 +0,0 @@
-utility
-imageFormFrom: aString
-
-	^ Form fromFileNamed: aString
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/class/newWith..st b/packages/TelegramClient-Core.package/TCCImageStore.class/class/newWith..st
deleted file mode 100644
index 51356af7c..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/class/newWith..st
+++ /dev/null
@@ -1,6 +0,0 @@
-instance creation
-newWith: aCore
-	
-	^ self new
-		core: aCore;
-		yourself
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core..st b/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core..st
deleted file mode 100644
index bd19251b0..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core..st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-core: aCore
-
-	core := aCore
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core.st b/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core.st
deleted file mode 100644
index 7652dd8d1..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/core.st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-core
-
-	^ core
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormFor..st b/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormFor..st
deleted file mode 100644
index 3d7e274f6..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormFor..st
+++ /dev/null
@@ -1,7 +0,0 @@
-accessing
-getFormFor: anImageId
-
-	| promise |
-	promise := self getFormPromiseFor: anImageId.
-	promise wait.
-	^ promise value
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormPromiseFor..st b/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormPromiseFor..st
deleted file mode 100644
index 930320622..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/getFormPromiseFor..st
+++ /dev/null
@@ -1,10 +0,0 @@
-accessing
-getFormPromiseFor: anImageId
-
-	| promise |
-	promise := self at: anImageId ifAbsent: [
-		self at: anImageId put: Promise new.
-		self requestImageFor: anImageId with: (self at: anImageId).
- 		self at: anImageId
-	].
-	^ promise >>= [:aPath | self class imageFormFrom: aPath]
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/requestImageFor.with..st b/packages/TelegramClient-Core.package/TCCImageStore.class/instance/requestImageFor.with..st
deleted file mode 100644
index 7c699d4e9..000000000
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/instance/requestImageFor.with..st
+++ /dev/null
@@ -1,9 +0,0 @@
-utility
-requestImageFor: anImageId with: aPromise
-
-	"documented here:"
-	"https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1download_file.html"
-
-	self core
-		send: (TCCRequest newRequestFile: anImageId)
-		thenDo: [:imageEvent | aPromise resolveWith: (self class extractPathFrom: imageEvent)].
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCImageStore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCImageStore.class/methodProperties.json
index c1a995105..0e4a66223 100644
--- a/packages/TelegramClient-Core.package/TCCImageStore.class/methodProperties.json
+++ b/packages/TelegramClient-Core.package/TCCImageStore.class/methodProperties.json
@@ -1,11 +1,5 @@
 {
 	"class" : {
-		"extractPathFrom:" : "6/23/2024 14:02:55",
-		"imageFormFrom:" : "6/23/2024 14:02:55",
-		"newWith:" : "6/23/2024 14:02:55" },
+		 },
 	"instance" : {
-		"core" : "6/23/2024 14:02:55",
-		"core:" : "6/23/2024 14:02:55",
-		"getFormFor:" : "6/23/2024 14:02:55",
-		"getFormPromiseFor:" : "6/23/2024 14:02:55",
-		"requestImageFor:with:" : "6/22/2024 13:42:57" } }
+		 } }
diff --git a/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendDocumentMessage.to..st b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendDocumentMessage.to..st
index fd438e246..71239f48f 100644
--- a/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendDocumentMessage.to..st
+++ b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendDocumentMessage.to..st
@@ -1,7 +1,5 @@
 instance creation
 newSendDocumentMessage: aDocumentPath to: aChatId
-	Transcript show: aDocumentPath.
-	self halt.
 
 	^ TCCRequest
 		newWithType: 'sendMessage'
diff --git a/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to..st b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to..st
new file mode 100644
index 000000000..ba1d06608
--- /dev/null
+++ b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to..st
@@ -0,0 +1,32 @@
+instance creation
+newSendPollMessage: aPoll to: aChatId
+
+	^ TCCRequest
+		newWithType: 'sendMessage'
+		from: {
+			'chat_id' -> aChatId.
+			'input_message_content' -> (Dictionary newFrom: {
+				'@type' -> 'inputMessagePoll'.
+				'question' -> (Dictionary newFrom: {
+					'@type' -> 'formattedText'.
+					'text' -> 'hallo'	
+				}).
+				'options' -> (OrderedCollection newFrom: {(Dictionary newFrom: {
+					'@type' -> 'formattedText'.
+					'text' -> 'Option 1'  
+				}).
+				(Dictionary newFrom: {
+					'@type' -> 'formattedText'.
+					'text' -> 'Option 2'
+				}).
+				(Dictionary newFrom: {
+					'@type' -> 'formattedText'.
+					'text' -> 'Option 3'
+				})}).
+				'is_anonymous' -> 'false'.
+				'type' -> (Dictionary newFrom: {
+					'@type' -> 'pollTypeRegular'.
+					'allow_multiple_answers' -> 'false'
+				})
+			})
+		}
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to.asking.with.isAnonymous..st b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to.asking.with.isAnonymous..st
new file mode 100644
index 000000000..192f88cb4
--- /dev/null
+++ b/packages/TelegramClient-Core.package/TCCRequest.class/class/newSendPollMessage.to.asking.with.isAnonymous..st
@@ -0,0 +1,15 @@
+instance creation
+newSendPollMessage: aPollType to: aChatId asking: aString with: anOptionOrderedCollection isAnonymous: aBoolean
+
+	^ (TCCRequest
+		newWithType: 'sendMessage'
+		from: {
+			'chat_id' -> aChatId.
+			'input_message_content' -> (Dictionary newFrom: {
+				'@type' -> 'inputMessagePoll'.
+				'question' -> aString.
+				'options' -> anOptionOrderedCollection.
+				'is_anonymous' -> aBoolean.
+				'type' ->(self selectJsonFor: aPollType).
+				}).
+			})
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCRequest.class/class/selectJsonFor..st b/packages/TelegramClient-Core.package/TCCRequest.class/class/selectJsonFor..st
new file mode 100644
index 000000000..5747168e5
--- /dev/null
+++ b/packages/TelegramClient-Core.package/TCCRequest.class/class/selectJsonFor..st
@@ -0,0 +1,10 @@
+as yet unclassified
+selectJsonFor: aPollType
+
+	^ aPollType caseOf: {
+		['regular'] -> [(Dictionary newFrom: {'@type' -> 'pollTypeRegular'. 
+		'allow_multiple_answers' -> false. })].
+		['multiple'] -> [(Dictionary newFrom: {'@type' -> 'pollTypeRegular'. 
+		'allow_multiple_answers' -> true. })].
+		['quiz'] -> [(Dictionary newFrom: {'@type' -> 'pollTypeQuiz'. 'correct_option_id' -> 0. })]
+	}
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCRequest.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCRequest.class/methodProperties.json
index 421547532..2ccfbf75a 100644
--- a/packages/TelegramClient-Core.package/TCCRequest.class/methodProperties.json
+++ b/packages/TelegramClient-Core.package/TCCRequest.class/methodProperties.json
@@ -16,16 +16,19 @@
 		"newRequestFile:" : "JB 8/1/2021 11:35",
 		"newRequestSticker:" : "JK 5/16/2024 21:39",
 		"newSearchChatFrom:" : "RS 6/23/2021 16:38",
-		"newSendDocumentMessage:to:" : "ED 6/26/2024 14:59",
+		"newSendDocumentMessage:to:" : "JK 6/28/2024 10:15",
 		"newSendFileMessage:to:" : "ED 6/19/2024 13:51",
 		"newSendMessage:to:" : "6/7/2024 09:02:10",
 		"newSendMessage:to:asReplyTo:" : "JS 5/20/2022 10:02",
 		"newSendPhoneNumber:" : "RS 6/23/2021 16:34",
-		"newSendPhotoMessage:to:" : "ED 6/19/2024 12:10",
+		"newSendPhotoMessage:to:" : "jkon 6/27/2024 09:20",
+		"newSendPollMessage:to:" : "7/5/2024 09:48:19",
+		"newSendPollMessage:to:asking:with:isAnonymous:" : "jkon 6/28/2024 09:16",
 		"newSendStickerMessage:to:" : "JK 6/21/2024 14:08",
 		"newSendVideoMessage:to:" : "ED 6/19/2024 12:22",
 		"newSetPollAnswer:message:options:" : "TU 6/6/2024 01:15",
 		"newUser:" : "JB 8/1/2021 11:55",
-		"newWithType:from:" : "rs 6/6/2020 16:21" },
+		"newWithType:from:" : "rs 6/6/2020 16:21",
+		"selectJsonFor:" : "jkon 6/27/2024 14:35" },
 	"instance" : {
 		"asString" : "js 8/1/2020 12:16" } }
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/extractPathFrom..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/class/extractPathFrom..st
deleted file mode 100644
index 276d1b715..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/extractPathFrom..st
+++ /dev/null
@@ -1,4 +0,0 @@
-utility
-extractPathFrom: anEvent
-	
-	^ (anEvent at: 'local') at: 'path'
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/stickerFormFrom..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/class/stickerFormFrom..st
deleted file mode 100644
index 9bac22610..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/stickerFormFrom..st
+++ /dev/null
@@ -1,9 +0,0 @@
-utility
-stickerFormFrom: aString
-
-	| file byteArray |
-	file := FileStream fileNamed: aString.
-	file binary.
-	byteArray := file next: file size.
-	file close.
-	^ (TCCLibWebP decode: byteArray).
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core..st
deleted file mode 100644
index bd19251b0..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core..st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-core: aCore
-
-	core := aCore
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core.st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core.st
deleted file mode 100644
index 7652dd8d1..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/core.st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-core
-
-	^ core
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/downloadStickerSet..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/downloadStickerSet..st
deleted file mode 100644
index 288ce25f2..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/downloadStickerSet..st
+++ /dev/null
@@ -1,6 +0,0 @@
-as yet unclassified
-downloadStickerSet: aStickerSet
-	
-	self storeStickerSet: aStickerSet.
-	(aStickerSet at: 'stickers') do: [:sticker | 
-		self getFormPromiseFor: ((sticker at: 'sticker') at: 'id')].
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormFor..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormFor..st
deleted file mode 100644
index c11bdd356..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormFor..st
+++ /dev/null
@@ -1,8 +0,0 @@
-accessing
-getFormFor: aStickerId
-
-	| promise |
-	
-	promise := self getFormPromiseFor: aStickerId.
-	promise wait.
-	^ promise value
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormPromiseFor..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormPromiseFor..st
deleted file mode 100644
index 68d6a0f7e..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getFormPromiseFor..st
+++ /dev/null
@@ -1,10 +0,0 @@
-accessing
-getFormPromiseFor: aStickerId
-
-	| promise |
-	promise := self at: aStickerId ifAbsent: [
-		self at: aStickerId put: Promise new.
-		self requestStickerFor: aStickerId with: (self at: aStickerId).
- 		self at: aStickerId
-	].
-	^ promise >>= [:aPath | self class stickerFormFrom: aPath]
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getInstalledStickers.st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getInstalledStickers.st
deleted file mode 100644
index 12b5646c4..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/getInstalledStickers.st
+++ /dev/null
@@ -1,10 +0,0 @@
-as yet unclassified
-getInstalledStickers
-
-	| sets |
-	
-	sets := Array new.
-	self core send: (TCCRequest getInstalledStickerSets)
-		thenDo: [:stickerEvent | sets := stickerEvent at: 'sets'.
-			sets do: [:setInfo | self core send: (TCCRequest getStickerSetFor: (setInfo at: 'id'))
-				thenDo: [:set | (set at: 'is_animated') ifFalse: [self downloadStickerSet: set.]]]].
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/requestStickerFor.with..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/requestStickerFor.with..st
deleted file mode 100644
index 763f73f3c..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/requestStickerFor.with..st
+++ /dev/null
@@ -1,9 +0,0 @@
-utility
-requestStickerFor: aStickerId with: aPromise
-
-	"documented here:"
-	"https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1download_file.html"
-
-	self core
-		send: (TCCRequest newRequestSticker: aStickerId)
-		thenDo: [:stickerEvent | aPromise resolveWith: (self class extractPathFrom: stickerEvent)].
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds..st
deleted file mode 100644
index 53e42fac2..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds..st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-stickerIds: aStickerIdsArray
-
-	stickerIds := aStickerIdsArray
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds.st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds.st
deleted file mode 100644
index b63ef0308..000000000
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/stickerIds.st
+++ /dev/null
@@ -1,4 +0,0 @@
-accessing
-stickerIds
-
-	^ stickerIds
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json
index 0c43de1ea..dc053cbbb 100644
--- a/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json
+++ b/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json
@@ -1,20 +1,9 @@
 {
 	"class" : {
-		"extractPathFrom:" : "6/23/2024 14:02:55",
 		"imageFormFrom:" : "JK 6/21/2024 13:46",
-		"newWith:" : "JK 6/20/2024 22:18",
-		"stickerFormFrom:" : "6/23/2024 14:02:55" },
+		"newWith:" : "JK 6/20/2024 22:18" },
 	"instance" : {
-		"core" : "6/23/2024 14:02:55",
-		"core:" : "6/23/2024 14:02:55",
-		"downloadStickerSet:" : "JK 6/19/2024 11:33",
-		"getFormFor:" : "6/23/2024 14:02:55",
-		"getFormPromiseFor:" : "6/23/2024 14:02:55",
-		"getInstalledStickers" : "6/23/2024 17:46:17",
 		"loadStickerIds" : "JK 6/20/2024 23:39",
-		"requestStickerFor:with:" : "JK 5/16/2024 21:40",
-		"stickerIds" : "6/23/2024 17:46:17",
-		"stickerIds:" : "6/23/2024 17:46:17",
 		"stickerSets" : "JK 6/19/2024 11:30",
 		"stickerSets:" : "JK 6/19/2024 11:30",
-		"storeStickerSet:" : "JK 6/23/2024 16:33" } }
+		"storeStickerSet:" : "JK 7/4/2024 10:50" } }
diff --git a/packages/TelegramClient-Core.package/TCCVideoStore.class/class/extractPathFrom..st b/packages/TelegramClient-Core.package/TCCVideoStore.class/class/extractPathFrom..st
deleted file mode 100644
index 276d1b715..000000000
--- a/packages/TelegramClient-Core.package/TCCVideoStore.class/class/extractPathFrom..st
+++ /dev/null
@@ -1,4 +0,0 @@
-utility
-extractPathFrom: anEvent
-	
-	^ (anEvent at: 'local') at: 'path'
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCVideoStore.class/class/imageFormFrom..st b/packages/TelegramClient-Core.package/TCCVideoStore.class/class/imageFormFrom..st
deleted file mode 100644
index 01f1dc7a4..000000000
--- a/packages/TelegramClient-Core.package/TCCVideoStore.class/class/imageFormFrom..st
+++ /dev/null
@@ -1,4 +0,0 @@
-utility
-imageFormFrom: aString
-
-	^ Form fromFileNamed: aString
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormFor..st b/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormFor..st
deleted file mode 100644
index 4619676d9..000000000
--- a/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormFor..st
+++ /dev/null
@@ -1,7 +0,0 @@
-accessing
-getFormFor: aThumbnailId
-
-	| promise |
-	promise := self getFormPromiseFor: aThumbnailId.
-	promise wait.
-	^ promise value
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormPromiseFor..st b/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormPromiseFor..st
deleted file mode 100644
index 3e615c584..000000000
--- a/packages/TelegramClient-Core.package/TCCVideoStore.class/instance/getFormPromiseFor..st
+++ /dev/null
@@ -1,10 +0,0 @@
-accessing
-getFormPromiseFor: aThumbnailId
-
-	| promise |
-	promise := self at: aThumbnailId ifAbsent: [
-		self at: aThumbnailId put: Promise new.
-		self requestFileFor: aThumbnailId with: (self at: aThumbnailId).
- 		self at: aThumbnailId
-	].
-	^ promise >>= [:aPath | self class imageFormFrom: aPath]
\ No newline at end of file
diff --git a/packages/TelegramClient-Core.package/TCCVideoStore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCVideoStore.class/methodProperties.json
index 3adf81380..190c2b5a8 100644
--- a/packages/TelegramClient-Core.package/TCCVideoStore.class/methodProperties.json
+++ b/packages/TelegramClient-Core.package/TCCVideoStore.class/methodProperties.json
@@ -1,10 +1,6 @@
 {
 	"class" : {
-		"extractPathFrom:" : "6/23/2024 14:02:55",
-		"imageFormFrom:" : "6/23/2024 14:02:55",
 		"newWith:" : "ED 6/26/2024 14:50" },
 	"instance" : {
-		"getFormFor:" : "6/23/2024 14:02:55",
-		"getFormPromiseFor:" : "6/23/2024 14:02:55",
 		"getVideoFor:" : "JK 6/12/2024 19:48",
 		"getVideoPromiseFor:" : "JK 6/12/2024 19:56" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/README.md b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds..st
new file mode 100644
index 000000000..32e4aa966
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds..st
@@ -0,0 +1,7 @@
+as yet unclassified
+newFor: aChatWindow withBounds: aRectangle
+
+	^ (super newBounds: aRectangle)
+		chatWindow: aChatWindow;
+		addButtonMenu;
+		yourself
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds.from..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds.from..st
new file mode 100644
index 000000000..3fcc65ed1
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/class/newFor.withBounds.from..st
@@ -0,0 +1,8 @@
+as yet unclassified
+newFor: aChat withBounds: aRectangle from: aChatWindow
+
+	^ (super newBounds: aRectangle)
+		chat: aChat;
+		chatWindow: aChatWindow;
+		addButtonMenu;
+		yourself
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addButtonMenu.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addButtonMenu.st
new file mode 100644
index 000000000..0fadffe3c
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addButtonMenu.st
@@ -0,0 +1,9 @@
+as yet unclassified
+addButtonMenu
+
+	self createButtonMenu;
+		addStickerButton;
+		addFileButton.
+	(self chat isGroup) ifTrue: [self addPollButton].
+	self addMorphFront: self buttonMenu.
+	self buttonMenu center: self center.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addFileButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addFileButton.st
new file mode 100644
index 000000000..12d185b3c
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addFileButton.st
@@ -0,0 +1,10 @@
+as yet unclassified
+addFileButton
+
+	self fileButton: (TCUButton new
+		extent: 100 @ 30;
+		text: 'Select File';
+		on: #mouseUp send: #buttonFileSelectPressed to: self chatWindow;
+		name: 'selectFile';
+		yourself).
+	self buttonMenu addMorph: self fileButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addPollButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addPollButton.st
new file mode 100644
index 000000000..f6d42dc07
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addPollButton.st
@@ -0,0 +1,10 @@
+as yet unclassified
+addPollButton
+
+	self pollButton: (TCUButton new
+		extent: 100 @ 30;
+		text: '|||';
+		on: #mouseUp send: #createPollEditor to: self chatWindow;
+		name: 'openPollEditor';
+		yourself).
+	self buttonMenu addMorph: self pollButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addStickerButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addStickerButton.st
new file mode 100644
index 000000000..5a2ebce05
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/addStickerButton.st
@@ -0,0 +1,10 @@
+as yet unclassified
+addStickerButton
+
+	self stickerButton: (TCUButton new
+		extent: 100 @ 30;
+		text: 'Sticker';
+		on: #mouseUp send: #buttonStickerPressed to: self chatWindow;
+		name: 'sendSticker';
+		yourself).
+	self buttonMenu addMorph: self stickerButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu..st
new file mode 100644
index 000000000..a770cffed
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu..st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenu: aRectangle
+
+	buttonMenu := aRectangle
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu.st
new file mode 100644
index 000000000..9340e902c
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/buttonMenu.st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenu
+
+	^ buttonMenu
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat..st
new file mode 100644
index 000000000..cc3df5ef3
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat..st
@@ -0,0 +1,4 @@
+accessing
+chat: anObject
+
+	chat := anObject.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat.st
new file mode 100644
index 000000000..207f37ad7
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chat.st
@@ -0,0 +1,4 @@
+accessing
+chat
+
+	^ chat
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow..st
new file mode 100644
index 000000000..b39ec2b13
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow..st
@@ -0,0 +1,4 @@
+as yet unclassified
+chatWindow: aChatWindow
+
+	chatWindow := aChatWindow
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow.st
new file mode 100644
index 000000000..4f8bb9421
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/chatWindow.st
@@ -0,0 +1,4 @@
+as yet unclassified
+chatWindow
+
+	^ chatWindow
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/clear.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/clear.st
new file mode 100644
index 000000000..1e47b3d2b
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/clear.st
@@ -0,0 +1,4 @@
+as yet unclassified
+clear
+
+	self abandon.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/createButtonMenu.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/createButtonMenu.st
new file mode 100644
index 000000000..ea5856ce9
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/createButtonMenu.st
@@ -0,0 +1,16 @@
+as yet unclassified
+createButtonMenu
+
+	self buttonMenu: (RectangleMorph new
+			color: TCUDefaultValues colorNileBlue;
+			extent: 200@200;
+			useRoundedCorners;
+			layoutPolicy: TableLayout new;
+			listDirection: #leftToRight;
+			wrapDirection: #bottomToTop;
+			wrapCentering: #topLeft;
+			layoutInset: 2;
+			hResizing: #shrinkWrap;
+			vResizing: #shrinkWrap;
+			cellInset: 8;
+			yourself).
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton..st
new file mode 100644
index 000000000..be1a2c0dc
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton..st
@@ -0,0 +1,4 @@
+accessing
+fileButton: anObject
+
+	fileButton := anObject.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton.st
new file mode 100644
index 000000000..333fb2fea
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/fileButton.st
@@ -0,0 +1,4 @@
+accessing
+fileButton
+
+	^ fileButton
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/initialize.st
new file mode 100644
index 000000000..c0e265eaa
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/initialize.st
@@ -0,0 +1,9 @@
+as yet unclassified
+initialize
+
+	super initialize.
+
+	self
+		color: (TCUDefaultValues colorLightGray alpha: 0.8);
+		borderWidth: 0;
+		on: #mouseUp send: #clear to: self.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton..st
new file mode 100644
index 000000000..e3fe070c9
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton..st
@@ -0,0 +1,4 @@
+accessing
+pollButton: anObject
+
+	pollButton := anObject.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton.st
new file mode 100644
index 000000000..f512f0d04
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/pollButton.st
@@ -0,0 +1,4 @@
+accessing
+pollButton
+
+	^ pollButton
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton..st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton..st
new file mode 100644
index 000000000..3f5b89d99
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton..st
@@ -0,0 +1,4 @@
+accessing
+stickerButton: anObject
+
+	stickerButton := anObject.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton.st b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton.st
new file mode 100644
index 000000000..d5f75d306
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/instance/stickerButton.st
@@ -0,0 +1,4 @@
+accessing
+stickerButton
+
+	^ stickerButton
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/methodProperties.json
new file mode 100644
index 000000000..75083201e
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/methodProperties.json
@@ -0,0 +1,24 @@
+{
+	"class" : {
+		"newFor:withBounds:" : "jkon 7/4/2024 22:57",
+		"newFor:withBounds:from:" : "jkon 7/5/2024 09:30" },
+	"instance" : {
+		"addButtonMenu" : "jkon 7/5/2024 09:30",
+		"addFileButton" : "jkon 7/4/2024 22:43",
+		"addPollButton" : "jkon 7/4/2024 22:43",
+		"addStickerButton" : "jkon 7/4/2024 22:43",
+		"buttonMenu" : "jkon 7/4/2024 22:11",
+		"buttonMenu:" : "jkon 7/4/2024 22:11",
+		"chat" : "jkon 7/4/2024 22:06",
+		"chat:" : "jkon 7/4/2024 22:06",
+		"chatWindow" : "jkon 7/4/2024 22:42",
+		"chatWindow:" : "jkon 7/4/2024 22:43",
+		"clear" : "jkon 7/4/2024 22:09",
+		"createButtonMenu" : "jkon 7/4/2024 22:13",
+		"fileButton" : "jkon 7/4/2024 22:06",
+		"fileButton:" : "jkon 7/4/2024 22:06",
+		"initialize" : "jkon 7/4/2024 22:08",
+		"pollButton" : "jkon 7/4/2024 22:06",
+		"pollButton:" : "jkon 7/4/2024 22:06",
+		"stickerButton" : "jkon 7/4/2024 22:06",
+		"stickerButton:" : "jkon 7/4/2024 22:06" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatButtonPage.class/properties.json b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/properties.json
new file mode 100644
index 000000000..c6604ce06
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatButtonPage.class/properties.json
@@ -0,0 +1,19 @@
+{
+	"category" : "TelegramClient-UI",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"chat",
+		"pollButton",
+		"fileButton",
+		"stickerButton",
+		"buttonMenu",
+		"chatWindow" ],
+	"name" : "TCUChatButtonPage",
+	"pools" : [
+		 ],
+	"super" : "RectangleMorph",
+	"type" : "normal" }
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addTestmorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addTestmorph.st
deleted file mode 100644
index 7f01bd701..000000000
--- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addTestmorph.st
+++ /dev/null
@@ -1,5 +0,0 @@
-as yet unclassified
-addTestmorph
-
-	self createTestMorph.
-	self contentWrapper addMorph: self testmorph.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createTestMorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createTestMorph.st
deleted file mode 100644
index 741b61932..000000000
--- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createTestMorph.st
+++ /dev/null
@@ -1,13 +0,0 @@
-as yet unclassified
-createTestMorph
-
-	self testmorph: (RectangleMorph new
-		borderWidth: 0;
-		color: Color white;
-		layoutPolicy: TableLayout new;
-		listDirection: #topToBottom;
-		hResizing: #spaceFill;
-		vResizing: #shrinkWrap;
-		cellInset: self class defaultContentInset;
-		useRoundedCorners;
-		yourself).
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph..st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph..st
deleted file mode 100644
index 041d64fe1..000000000
--- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph..st
+++ /dev/null
@@ -1,4 +0,0 @@
-as yet unclassified
-testmorph: aRectangleMorph
-
-	testmorph := aRectangleMorph
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph.st
deleted file mode 100644
index a632754a8..000000000
--- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph.st
+++ /dev/null
@@ -1,4 +0,0 @@
-as yet unclassified
-testmorph
-	
-	^ testmorph.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json
index 814d99e24..41c55ec18 100644
--- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json
+++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json
@@ -17,7 +17,6 @@
 		"addInfoBar" : "RS 5/20/2021 21:28",
 		"addInfoText" : "jkon 5/15/2024 11:04",
 		"addPhoto" : "jkon 5/22/2024 10:26",
-		"addTestmorph" : "TU 6/14/2024 09:29",
 		"addTitle" : "jkon 5/22/2024 10:55",
 		"addTitleText" : "jkon 5/22/2024 11:04",
 		"addUserList" : "jkon 5/15/2024 11:55",
@@ -31,7 +30,6 @@
 		"createContentWrapper" : "jkon 5/15/2024 11:53",
 		"createDescription" : "RS 5/29/2021 18:32",
 		"createInfoBar" : "RS 5/20/2021 21:31",
-		"createTestMorph" : "TU 6/14/2024 09:29",
 		"createTitle" : "jkon 5/22/2024 10:54",
 		"description" : "RS 5/29/2021 18:46",
 		"description:" : "RK 8/4/2021 10:26",
@@ -43,8 +41,6 @@
 		"photoPage" : "jkon 5/15/2024 15:05",
 		"photoPage:" : "jkon 5/15/2024 15:05",
 		"showPhotoPage" : "jkon 5/15/2024 15:07",
-		"testmorph" : "TU 6/14/2024 09:29",
-		"testmorph:" : "TU 6/14/2024 09:29",
 		"title" : "jkon 5/22/2024 10:50",
 		"title:" : "jkon 5/22/2024 10:50",
 		"userList" : "per 6/3/2021 17:27",
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st
index 7f238ff84..36aa95b52 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st
@@ -3,5 +3,6 @@ newFor: aChat withBounds: aRectangle
 
 	^ (super newBounds: aRectangle)
 		chat: aChat;
+		allInputFields: (OrderedCollection new);
 		addTypeOption;
 		yourself
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st
index e845cf51c..755f32c4c 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st
@@ -1,7 +1,15 @@
 drawing
 addChoices: aRectangle
 
-	aRectangle addMorph: (TCUChoice newFor: 'Anonymous Poll?');
-		addMorph: (TCUChoiceExclusive newFor: 'Standard Poll' inPoll: self);
-		addMorph: (TCUChoiceExclusive newFor: 'Multiple Options' inPoll: self);
-		addMorph: (TCUChoiceExclusive newFor: 'Quiz' inPoll: self).
\ No newline at end of file
+	self createAnonymousChoice. 
+	
+	aRectangle addMorph: self anonymousChoice;
+		addMorph: ((TCUChoiceExclusive newFor: 'Standard Poll' inPoll: self)
+			name: 'regular';
+			yourself);
+		addMorph: ((TCUChoiceExclusive newFor: 'Multiple Options' inPoll: self)
+			name: 'multiple';
+			yourself);
+		addMorph: ((TCUChoiceExclusive newFor: 'Quiz' inPoll: self)
+			name: 'quiz';
+			yourself).
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices.st
deleted file mode 100644
index 14d78ca07..000000000
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices.st
+++ /dev/null
@@ -1,7 +0,0 @@
-as yet unclassified
-addChoices
-
-	self addMorph: (TCUChoice newFor: 'Anonymous Poll?' isExclusive: false);
-		addMorph: (TCUChoice newFor: 'Standard Poll' isExclusive: true);
-		addMorph: (TCUChoice newFor: 'Multiple Options' isExclusive: true);
-		addMorph: (TCUChoice newFor: 'Quiz' isExclusive: true).
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st
index 8457eb1ae..eedd3ed27 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st
@@ -8,7 +8,7 @@ addInputFieldFor: aRectangle
 		color: Color white;
 		contentsWrapped: '' asText;
 		extent: 200 @ 20;
-		"crAction: [self buttonSendPressed];
-	"	yourself).
+		yourself).
+	self allInputFields add: inputField.
 	aRectangle addMorph: inputField.
 	
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields..st
new file mode 100644
index 000000000..38b907a07
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields..st
@@ -0,0 +1,4 @@
+as yet unclassified
+allInputFields: anOrderedCollection
+
+	allInputFields:= anOrderedCollection
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields.st
new file mode 100644
index 000000000..bddcae00d
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/allInputFields.st
@@ -0,0 +1,4 @@
+as yet unclassified
+allInputFields
+
+	^ allInputFields
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice..st
new file mode 100644
index 000000000..c33793bd0
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice..st
@@ -0,0 +1,4 @@
+as yet unclassified
+anonymousChoice: aChoice
+
+	anonymousChoice := aChoice
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice.st
new file mode 100644
index 000000000..a0d15f312
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/anonymousChoice.st
@@ -0,0 +1,4 @@
+as yet unclassified
+anonymousChoice
+
+	^ anonymousChoice
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st
index c0c1bb2b9..18a1e0106 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st
@@ -1,4 +1,7 @@
 event handling
 confirmPressed
 
+	self question: (self allInputFields at: 1) contents asString withBlanksTrimmed squeakToUtf8.
+	self getOptions.
+	(self question) ifNotEmpty: [self chat sendPollMessage: (self pollType) asking: (self question) with: (self options) isAnonymous: (self isAnonymous)].
 	self abandon.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createAnonymousChoice.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createAnonymousChoice.st
new file mode 100644
index 000000000..39a646e0a
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createAnonymousChoice.st
@@ -0,0 +1,4 @@
+as yet unclassified
+createAnonymousChoice
+
+	self anonymousChoice: (TCUChoice newFor: 'Anonymous Poll?').
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/getOptions.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/getOptions.st
new file mode 100644
index 000000000..da399799c
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/getOptions.st
@@ -0,0 +1,7 @@
+as yet unclassified
+getOptions
+
+	self options: (OrderedCollection new).
+	self options add: (self allInputFields at: 2) contents asString withBlanksTrimmed squeakToUtf8.
+	self options add: (self allInputFields at: 3) contents asString withBlanksTrimmed squeakToUtf8.
+	self options add: (self allInputFields at: 4) contents asString withBlanksTrimmed squeakToUtf8.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous..st
new file mode 100644
index 000000000..57d191a4d
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous..st
@@ -0,0 +1,4 @@
+as yet unclassified
+isAnonymous: aBoolean
+
+	isAnonymous := aBoolean
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous.st
new file mode 100644
index 000000000..dc67801c9
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/isAnonymous.st
@@ -0,0 +1,4 @@
+as yet unclassified
+isAnonymous
+
+	^ isAnonymous
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st
index 0e0067c60..1da3ecae4 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st
@@ -1,5 +1,7 @@
 event handling
 nextPressed
 
+	self isAnonymous: self anonymousChoice isSelected.
+	self pollType: (self currentSelection) name.
 	self typeOption abandon.
 	self createNameSetter.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options..st
new file mode 100644
index 000000000..e95732e56
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options..st
@@ -0,0 +1,4 @@
+as yet unclassified
+options: anOrderedCollection
+
+	options := anOrderedCollection
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options.st
new file mode 100644
index 000000000..09daee89b
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/options.st
@@ -0,0 +1,4 @@
+as yet unclassified
+options
+
+	^ options
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType..st
new file mode 100644
index 000000000..493fa6344
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType..st
@@ -0,0 +1,4 @@
+as yet unclassified
+pollType: aString
+
+	pollType := aString
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType.st
new file mode 100644
index 000000000..f29317dff
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/pollType.st
@@ -0,0 +1,4 @@
+as yet unclassified
+pollType
+
+	^ pollType
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question..st
new file mode 100644
index 000000000..9c6d21323
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question..st
@@ -0,0 +1,4 @@
+as yet unclassified
+question: aString
+
+	question := aString
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question.st
new file mode 100644
index 000000000..b0e87e365
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/question.st
@@ -0,0 +1,4 @@
+as yet unclassified
+question
+
+	^ question
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json
index 778162d1e..5bc729c16 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json
@@ -1,25 +1,38 @@
 {
 	"class" : {
-		"newFor:withBounds:" : "jkon 6/17/2024 11:14" },
+		"newFor:withBounds:" : "jkon 6/27/2024 20:14" },
 	"instance" : {
-		"addChoices" : "6/24/2024 10:41:19",
-		"addChoices:" : "jkon 6/19/2024 21:34",
+		"addChoices:" : "jkon 6/27/2024 19:24",
 		"addConfirmButton:" : "jkon 6/18/2024 10:05",
-		"addInputFieldFor:" : "jkon 6/19/2024 21:44",
+		"addInputFieldFor:" : "jkon 7/5/2024 10:00",
 		"addNextButton:" : "jkon 6/19/2024 18:50",
 		"addTextFieldFor:with:" : "jkon 6/18/2024 13:31",
 		"addTextInputFor:" : "jkon 6/19/2024 21:41",
 		"addTypeOption" : "jkon 6/19/2024 21:29",
+		"allInputFields" : "jkon 6/27/2024 20:13",
+		"allInputFields:" : "jkon 6/27/2024 20:14",
+		"anonymousChoice" : "jkon 6/27/2024 19:03",
+		"anonymousChoice:" : "jkon 6/27/2024 19:03",
 		"chat" : "jkon 6/17/2024 10:29",
 		"chat:" : "jkon 6/17/2024 10:29",
 		"clear" : "jkon 6/18/2024 13:40",
-		"confirmPressed" : "jkon 6/19/2024 18:52",
+		"confirmPressed" : "jkon 6/27/2024 20:32",
+		"createAnonymousChoice" : "jkon 6/27/2024 19:02",
 		"createNameSetter" : "jkon 6/19/2024 21:33",
 		"createTypeOption" : "jkon 6/19/2024 21:48",
 		"currentSelection" : "jkon 6/19/2024 18:39",
 		"currentSelection:" : "jkon 6/19/2024 18:40",
+		"getOptions" : "jkon 6/27/2024 20:32",
 		"initialize" : "jkon 6/18/2024 13:39",
+		"isAnonymous" : "jkon 6/27/2024 19:14",
+		"isAnonymous:" : "jkon 6/28/2024 09:12",
 		"newSelection:" : "jkon 6/19/2024 18:39",
-		"nextPressed" : "jkon 6/19/2024 18:51",
+		"nextPressed" : "jkon 6/27/2024 19:27",
+		"options" : "jkon 6/27/2024 14:47",
+		"options:" : "jkon 6/27/2024 14:47",
+		"pollType" : "jkon 6/27/2024 14:46",
+		"pollType:" : "jkon 6/27/2024 14:46",
+		"question" : "jkon 6/27/2024 14:46",
+		"question:" : "jkon 6/27/2024 14:47",
 		"typeOption" : "jkon 6/17/2024 11:03",
 		"typeOption:" : "jkon 6/17/2024 11:03" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json
index 2d12af58a..bc8c74541 100644
--- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json
+++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json
@@ -11,7 +11,13 @@
 		"selectionMorph",
 		"textMorph",
 		"isSelected",
-		"currentSelection" ],
+		"currentSelection",
+		"pollType",
+		"question",
+		"options",
+		"anonymousChoice",
+		"isAnonymous",
+		"allInputFields" ],
 	"name" : "TCUChatPollEditor",
 	"pools" : [
 		 ],
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addFileButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addFileButton.st
index 42f648beb..84397a4c0 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addFileButton.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addFileButton.st
@@ -2,8 +2,9 @@ drawing
 addFileButton
 
 	self fileButton: (TCUButton new
+		extent: 100 @ 30;
 		text: 'Select File';
 		on: #mouseUp send: #buttonFileSelectPressed to: self;
 		name: 'selectFile';
 		yourself).
-	self inputBar addMorph: self fileButton.
\ No newline at end of file
+	self buttonMenu addMorph: self fileButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addInputBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addInputBar.st
index 6fdf16409..6c79a1556 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addInputBar.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addInputBar.st
@@ -5,4 +5,5 @@ addInputBar
 		createInputBar;
 		addMorph: self inputBar;
 		addSendButton;
+		addbuttonMenuButton;
 		addTextInputField.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st
index 7f7d155e1..c6f0ade73 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st
@@ -2,9 +2,9 @@ drawing
 addPollButton
 
 	self pollButton: (TCUButton new
-		extent: 50 @ 30;
+		extent: 100 @ 30;
 		text: '|||';
 		on: #mouseUp send: #createPollEditor to: self;
 		name: 'openPollEditor';
 		yourself).
-	self inputBar addMorph: self pollButton.
\ No newline at end of file
+	self buttonMenu addMorph: self pollButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addStickerButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addStickerButton.st
index 10074b0c7..4cc8640d8 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addStickerButton.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addStickerButton.st
@@ -2,9 +2,9 @@ drawing
 addStickerButton
 
 	self stickerButton: (TCUButton new
-		extent: 50 @ 30;
-		text: '+';
+		extent: 100 @ 30;
+		text: 'Sticker';
 		on: #mouseUp send: #buttonStickerPressed to: self;
 		name: 'sendSticker';
 		yourself).
-	self inputBar addMorph: self stickerButton.
\ No newline at end of file
+	self buttonMenu addMorph: self stickerButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addbuttonMenuButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addbuttonMenuButton.st
new file mode 100644
index 000000000..ab79c0f33
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addbuttonMenuButton.st
@@ -0,0 +1,10 @@
+as yet unclassified
+addbuttonMenuButton
+
+	self buttonMenuButton: (TCUButton new
+		extent: 50 @ 30;
+		text: '+';
+		on: #mouseUp send: #createButtonMenu to: self;
+		name: 'openButtonMenu';
+		yourself).
+	self inputBar addMorph: self buttonMenuButton.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonFileSelectPressed.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonFileSelectPressed.st
index 41bcda4fc..047e5ad2d 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonFileSelectPressed.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonFileSelectPressed.st
@@ -15,8 +15,5 @@ buttonFileSelectPressed
 			(fileObject fullName endsWithAnyOf: videoEndings) ifTrue: [
 				self selectedChat sendVideoMessage: (fileObject fullName).
 			] ifFalse: [
-				self selectedChat sendDocumentMessage: (fileObject fullName).
-			]
-		]
-		
-	].
\ No newline at end of file
+				self selectedChat sendDocumentMessage: (fileObject fullName).]]].
+	self buttonMenu hide.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu..st
new file mode 100644
index 000000000..210cf07d8
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu..st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenu: aRectangleMorph
+
+	buttonMenu := aRectangleMorph
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu.st
new file mode 100644
index 000000000..9340e902c
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenu.st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenu
+
+	^ buttonMenu
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton..st
new file mode 100644
index 000000000..f9737ad58
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton..st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenuButton: aTCUButton
+
+	buttonMenuButton := aTCUButton
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton.st
new file mode 100644
index 000000000..20dbf4589
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonMenuButton.st
@@ -0,0 +1,4 @@
+as yet unclassified
+buttonMenuButton
+
+	^ buttonMenuButton
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st
index 1f33e24ac..ec1030182 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st
@@ -8,6 +8,6 @@ buttonStickerPressed
 		selectedChat: self selectedChat.
 	self stickerWindow: stickerWindow.
 	self addMorph: stickerWindow.
-	self stickerButton makeLighter.]
+	self buttonMenu stickerButton makeLighter]
 	ifNotNil: [self stickerWindow close.
 		self stickerWindow: nil]
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st
index 9e7c63b42..194b762cc 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st
@@ -8,5 +8,9 @@ clear
 	self infoPage hide.
 	self pollEditor ifNotNil: [self pollEditor abandon. 
 		self pollEditor: nil].
+	self buttonMenu ifNotNil: [self buttonMenu abandon. 
+		self buttonMenu: nil].
+	self stickerWindow ifNotNil: [self stickerWindow close.
+		self stickerWindow: nil].
 	self stickerWindow ifNotNil: [self stickerWindow close.
 		self stickerWindow: nil].
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createButtonMenu.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createButtonMenu.st
new file mode 100644
index 000000000..66af6a16a
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createButtonMenu.st
@@ -0,0 +1,6 @@
+as yet unclassified
+createButtonMenu
+
+	self
+		buttonMenu: (TCUChatButtonPage newFor: self selectedChat withBounds: self bounds from: self);
+		addMorphFront: self buttonMenu.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st
index 6c17f660f..6182b004a 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st
@@ -3,10 +3,8 @@ newChatSelected: aChat
 
 	self welcomeMessage hide.
 	self inputBar submorphsDo: #abandon.
-	self addStickerButton.
-	self addPollButton.
-	self addFileButton.
 	self addSendButton.
+	self addbuttonMenuButton.
 	self addTextInputField.
 	self inputBar show.
 	self titleBar delete.
@@ -16,6 +14,5 @@ newChatSelected: aChat
 		addTitleBar;
 		addHiddenInfoPage;
 		addHiddenPollEditor.
-		
 	self chatMessageList show.
 	self chatMessageList displayChat: aChat.
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/updateReplyMessage.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/updateReplyMessage.st
index b2e28a661..1aa0f819d 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/updateReplyMessage.st
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/updateReplyMessage.st
@@ -4,10 +4,8 @@ updateReplyMessage
 	| inputFieldText |
 	inputFieldText := self textInputField contents asString.
 	self inputBar submorphsDo: #abandon.
-	self addStickerButton.
-	self addPollButton.
-	self addFileButton.
 	self addSendButton.
+	self addbuttonMenuButton.
 	self addTextInputField.
 	self selectedChat selectedReplyToMessageId = self selectedChat class defaultSelectedReplyToMessageId ifFalse: [
 		self addReplyMessage.
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json
index 40d04b5c6..8f989917d 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json
@@ -2,29 +2,35 @@
 	"class" : {
 		"defaultInputfieldHeight" : "JS 5/20/2022 11:08",
 		"defaultTitleBarHeight" : "JB 6/28/2021 09:42",
-		"newWithHeight:width:" : "JB 7/6/2021 14:03" },
+		"newWithHeight:width:" : "jkon 7/4/2024 22:50" },
 	"instance" : {
 		"addChatMessageList" : "JB 7/6/2021 14:03",
 		"addChatTitle" : "RK 8/4/2021 12:06",
-		"addFileButton" : "ED 6/19/2024 10:59",
-		"addHiddenInfoPage" : "per 6/15/2021 09:02",
+		"addFileButton" : "jkon 7/3/2024 18:28",
+		"addHiddenInfoPage" : "jkon 7/3/2024 17:58",
 		"addHiddenPollEditor" : "6/24/2024 10:41:19",
-		"addInputBar" : "ED 6/19/2024 12:20",
+		"addInputBar" : "jkon 7/3/2024 18:09",
 		"addMemberCount" : "RK 8/4/2021 12:06",
-		"addPollButton" : "jkon 6/18/2024 13:38",
+		"addPollButton" : "jkon 7/3/2024 18:24",
 		"addReplyMessage" : "JS 5/22/2022 19:39",
 		"addSendButton" : "ek 6/19/2022 19:07",
-		"addStickerButton" : "JK 5/21/2024 10:07",
+		"addStickerButton" : "jkon 7/3/2024 18:24",
 		"addTextInputField" : "jkon 6/17/2024 09:58",
 		"addTitleBar" : "RS 5/29/2021 18:12",
 		"addWelcomeMessage" : "RK 8/4/2021 12:07",
-		"buttonFileSelectPressed" : "JK 6/26/2024 14:30",
+		"addbuttonMenuButton" : "jkon 7/4/2024 22:54",
+		"buttonFileSelectPressed" : "jkon 7/5/2024 09:48",
+		"buttonMenu" : "jkon 7/3/2024 17:54",
+		"buttonMenu:" : "jkon 7/3/2024 17:55",
+		"buttonMenuButton" : "jkon 7/3/2024 18:05",
+		"buttonMenuButton:" : "jkon 7/3/2024 18:05",
 		"buttonSendPressed" : "ek 6/19/2022 19:07",
-		"buttonStickerPressed" : "AH 6/23/2024 13:00",
+		"buttonStickerPressed" : "JK 7/5/2024 10:17",
 		"chatMessageList" : "JB 7/6/2021 14:02",
 		"chatMessageList:" : "JB 7/6/2021 14:02",
-		"clear" : "jkon 6/18/2024 10:48",
+		"clear" : "jkon 7/5/2024 09:28",
 		"core" : "js 8/2/2020 22:11",
+		"createButtonMenu" : "jkon 7/5/2024 09:31",
 		"createInputBar" : "jkon 6/17/2024 09:59",
 		"createPollEditor" : "jkon 6/18/2024 13:38",
 		"createTitleBar" : "ek 6/19/2022 19:08",
@@ -35,7 +41,7 @@
 		"initialize" : "RS 5/20/2021 19:29",
 		"inputBar" : "rs 6/13/2020 10:38",
 		"inputBar:" : "RK 8/4/2021 10:48",
-		"newChatSelected:" : "ED 6/19/2024 11:16",
+		"newChatSelected:" : "jkon 7/4/2024 22:56",
 		"pollButton" : "jkon 6/17/2024 09:51",
 		"pollButton:" : "jkon 6/17/2024 09:52",
 		"pollEditor" : "jkon 6/17/2024 10:03",
@@ -56,6 +62,6 @@
 		"titleBar:" : "sp 8/2/2020 15:04",
 		"titleBarEntered" : "ek 6/19/2022 19:08",
 		"titleBarLeft" : "ek 6/19/2022 19:09",
-		"updateReplyMessage" : "ED 6/19/2024 12:27",
+		"updateReplyMessage" : "jkon 7/3/2024 18:10",
 		"welcomeMessage" : "rs 6/13/2020 09:36",
 		"welcomeMessage:" : "RK 8/4/2021 10:49" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/properties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/properties.json
index 482077423..18841a596 100644
--- a/packages/TelegramClient-UI.package/TCUChatWindow.class/properties.json
+++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/properties.json
@@ -17,7 +17,9 @@
 		"stickerWindow",
 		"pollButton",
 		"pollEditor",
-		"fileButton" ],
+		"fileButton",
+		"buttonMenu",
+		"buttonMenuButton" ],
 	"name" : "TCUChatWindow",
 	"pools" : [
 		 ],
diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/instance/name..st b/packages/TelegramClient-UI.package/TCUChoice.class/instance/name..st
new file mode 100644
index 000000000..79be6fbbb
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChoice.class/instance/name..st
@@ -0,0 +1,4 @@
+as yet unclassified
+name: aString
+
+	name := aString
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/instance/name.st b/packages/TelegramClient-UI.package/TCUChoice.class/instance/name.st
new file mode 100644
index 000000000..196234506
--- /dev/null
+++ b/packages/TelegramClient-UI.package/TCUChoice.class/instance/name.st
@@ -0,0 +1,4 @@
+as yet unclassified
+name
+
+	^ name
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json
index 45c34103b..f2368863b 100644
--- a/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json
+++ b/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json
@@ -12,6 +12,8 @@
 		"isExclusive:" : "6/24/2024 10:41:19",
 		"isSelected" : "jkon 6/17/2024 14:52",
 		"isSelected:" : "jkon 6/17/2024 14:52",
+		"name" : "jkon 6/27/2024 19:30",
+		"name:" : "jkon 6/27/2024 19:30",
 		"selectionMorph" : "jkon 6/17/2024 15:20",
 		"selectionMorph:" : "jkon 6/17/2024 15:20",
 		"updateChoice" : "jkon 6/18/2024 10:03" } }
diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/properties.json b/packages/TelegramClient-UI.package/TCUChoice.class/properties.json
index 7423d4116..84737784f 100644
--- a/packages/TelegramClient-UI.package/TCUChoice.class/properties.json
+++ b/packages/TelegramClient-UI.package/TCUChoice.class/properties.json
@@ -10,7 +10,8 @@
 		"isSelected",
 		"content",
 		"isExclusive",
-		"poll" ],
+		"poll",
+		"name" ],
 	"name" : "TCUChoice",
 	"pools" : [
 		 ],
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/buildStickerListItemsFor..st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/buildStickerListItemsFor..st
index 91cfa6bb3..1d17c7177 100644
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/buildStickerListItemsFor..st
+++ b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/buildStickerListItemsFor..st
@@ -11,6 +11,8 @@ buildStickerListItemsFor: anArray
 			selectedChat: self selectedChat;
 			path: ((self core stickerStore at: stickerId) value)).
 		item on: #mouseDown send: #sendStickerMessage:event:from: to: self selectedChat withValue: stickerId.
-		stickers add: item].
+		stickers add: item.
+		self scroller addMorphBack: item.
+		item refreshWorld].
 	self items: stickers.
 	
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/collectInstalledStickers.st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/collectInstalledStickers.st
deleted file mode 100644
index ca3f5aeb7..000000000
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/collectInstalledStickers.st
+++ /dev/null
@@ -1,10 +0,0 @@
-drawing
-collectInstalledStickers
-	
-	| core sets |
-	sets := Array new.
-	core := self core.
-	core send: (TCCRequest getInstalledStickerSets)
-		thenDo: [:stickerEvent | sets := stickerEvent at: 'sets'.
-			sets do: [:setInfo | core send: (TCCRequest getStickerSetFor: (setInfo at: 'id'))
-				thenDo: [:set | self downloadStickerSetFrom: set.]]].
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/downloadStickerSetFrom..st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/downloadStickerSetFrom..st
deleted file mode 100644
index 05f12a7d0..000000000
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/downloadStickerSetFrom..st
+++ /dev/null
@@ -1,5 +0,0 @@
-stepping and presenter
-downloadStickerSetFrom: aStickerSet
-
-	(aStickerSet at: 'stickers') do: [:sticker | 
-		core send: (TCCRequest newRequestSticker: ((sticker at: 'sticker') at: 'id'))].
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickers.st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickers.st
deleted file mode 100644
index 7e9139fb1..000000000
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickers.st
+++ /dev/null
@@ -1,4 +0,0 @@
-drawing
-loadStickers
-
-	^ self core stickerStore stickerIds
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickersFromStore.st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickersFromStore.st
deleted file mode 100644
index f951b0737..000000000
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/loadStickersFromStore.st
+++ /dev/null
@@ -1,8 +0,0 @@
-drawing
-loadStickersFromStore
-
-	| stickerpaths |
-	
-	stickerpaths := OrderedCollection new.
-	self core stickerStore values do: [:val | stickerpaths add: val value].
-	^ stickerpaths
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/showSelectedSet.st b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/showSelectedSet.st
index 4180e1b74..7def6fde4 100644
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/instance/showSelectedSet.st
+++ b/packages/TelegramClient-UI.package/TCUStickerList.class/instance/showSelectedSet.st
@@ -5,5 +5,5 @@ showSelectedSet
 	self clearItems.
 	stickers := self core stickerStore stickerSets at: self selectedSet.
 	self buildStickerListItemsFor: stickers.
-	self items do: [:anItem | self scroller addMorphBack: anItem].
+	"self items do: [:anItem | self scroller addMorphBack: anItem]."
 	
\ No newline at end of file
diff --git a/packages/TelegramClient-UI.package/TCUStickerList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUStickerList.class/methodProperties.json
index 0b9911718..3bb598bfb 100644
--- a/packages/TelegramClient-UI.package/TCUStickerList.class/methodProperties.json
+++ b/packages/TelegramClient-UI.package/TCUStickerList.class/methodProperties.json
@@ -6,16 +6,12 @@
 		"addNextButton" : "JK 6/19/2024 12:03",
 		"addPreviousButton" : "JK 6/19/2024 12:04",
 		"buildStickerListItems" : "6/23/2024 14:02:54",
-		"buildStickerListItemsFor:" : "JK 6/21/2024 14:07",
+		"buildStickerListItemsFor:" : "JK 7/5/2024 11:15",
 		"close" : "JK 5/29/2024 20:09",
-		"collectInstalledStickers" : "6/23/2024 14:02:54",
 		"convertWebp:" : "6/22/2024 13:42:57",
 		"core" : "JK 5/31/2024 14:29",
 		"core:" : "JK 5/31/2024 14:29",
-		"downloadStickerSetFrom:" : "6/23/2024 14:02:54",
 		"initialize" : "JK 6/20/2024 23:42",
-		"loadStickers" : "6/23/2024 14:02:54",
-		"loadStickersFromStore" : "6/23/2024 14:02:54",
 		"selectedChat" : "JK 5/28/2024 10:22",
 		"selectedChat:" : "JK 5/28/2024 10:23",
 		"selectedSet" : "JK 6/20/2024 11:39",
@@ -24,6 +20,6 @@
 		"shouldRedraw:" : "JK 5/22/2024 20:12",
 		"showNextSet" : "JK 6/21/2024 00:08",
 		"showPreviousSet" : "JK 6/21/2024 00:08",
-		"showSelectedSet" : "JK 6/21/2024 00:09",
+		"showSelectedSet" : "JK 7/4/2024 11:02",
 		"step" : "JK 6/21/2024 00:09",
 		"stepTime" : "JK 5/22/2024 19:59" } }