diff --git a/MeshtasticClient/Views/Messages/UserMessageList.swift b/MeshtasticClient/Views/Messages/UserMessageList.swift
index 245f1973..1a264094 100644
--- a/MeshtasticClient/Views/Messages/UserMessageList.swift
+++ b/MeshtasticClient/Views/Messages/UserMessageList.swift
@@ -12,27 +12,163 @@ struct UserMessageList: View {
 
 	@Environment(\.managedObjectContext) var context
 	@EnvironmentObject var bleManager: BLEManager
+	
+	enum Field: Hashable {
+		case messageText
+	}
+	// Keyboard State
+	@State var typingMessage: String = ""
+	@State private var totalBytes = 0
+	var maxbytes = 228
+	@State var lastTypingMessage = ""
+	@FocusState var focusedField: Field?
 
 	var user: UserEntity
+	
+	@State var showDeleteMessageAlert = false
+	@State private var deleteMessageId: Int64 = 0
 
     var body: some View {
 
 		HStack {
 
-			List {
+			VStack {
+				
+				List {
 
-				ScrollViewReader { _ in
+					ScrollViewReader { _ in
 
-					ScrollView {
+						ScrollView {
 
-						if user.receivedMessages != nil && user.receivedMessages!.count > 0 {
+							if user.receivedMessages?.count ?? 0 > 0 {
+							
+								ForEach( user.receivedMessages?.array as! [MessageEntity], id: \.self) { (message: MessageEntity) in
+									
+									HStack {
+										let currentUser: Bool = (bleManager.connectedPeripheral == nil) ? false : ((bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num == message.fromUser?.num) ? true : false )
+										
+										
+										if message.toUser!.num == Int64(bleManager.broadcastNodeNum) || ((bleManager.connectedPeripheral) != nil && bleManager.connectedPeripheral.num == message.fromUser?.num) ? true : true {
+											
+									
+										
+											VStack {
+											
+											HStack (alignment: .top) {
+												
+												CircleText(text: (message.fromUser?.shortName ?? "???"), color: currentUser ? .accentColor : Color(.darkGray)).padding(.all, 5)
+													.gesture(LongPressGesture(minimumDuration: 2)
+																.onEnded {_ in
 
-							ForEach( user.receivedMessages?.array as! [MessageEntity], id: \.self) { (_: MessageEntity) in
+														print("I want to delete message: \(message.messageId)")
+														self.showDeleteMessageAlert = true
+														self.deleteMessageId = message.messageId
 
+														print(deleteMessageId)
+													})
+											
+												VStack(alignment: .leading) {
+													
+													Text(message.messagePayload ?? "EMPTY MESSAGE")
+													.textSelection(.enabled)
+													.padding(10)
+													.foregroundColor(.white)
+													.background(currentUser ? Color.blue : Color(.darkGray))
+													.cornerRadius(10)
+													
+													HStack(spacing: 4) {
+
+														let time = Int32(message.messageTimestamp)
+														let messageDate = Date(timeIntervalSince1970: TimeInterval(time))
+
+														if time != 0 {
+															Text(messageDate, style: .date).font(.caption2).foregroundColor(.gray)
+															Text(messageDate, style: .time).font(.caption2).foregroundColor(.gray)
+														} else {
+															Text("Unknown").font(.caption2).foregroundColor(.gray)
+														}
+													}
+													.padding(.bottom, 10)
+												}
+												Spacer()
+											}
+										}
+											
+										}
+									}
+								}
 							}
 						}
 					}
 				}
+				
+				HStack(alignment: .top) {
+
+					ZStack {
+
+						let kbType = UIKeyboardType(rawValue: UserDefaults.standard.object(forKey: "keyboardType") as? Int ?? 0)
+						TextEditor(text: $typingMessage)
+							.onChange(of: typingMessage, perform: { value in
+
+								let size = value.utf8.count
+								totalBytes = size
+								if totalBytes <= maxbytes {
+									// Allow the user to type
+									lastTypingMessage = typingMessage
+								} else {
+									// Set the message back and remove the bytes over the count
+									self.typingMessage = lastTypingMessage
+								}
+							})
+							.keyboardType(kbType!)
+							.toolbar {
+								ToolbarItemGroup(placement: .keyboard) {
+
+									Button("Dismiss Keyboard") {
+										focusedField = nil
+									}
+									.font(.subheadline)
+
+									Spacer()
+
+									ProgressView("Bytes: \(totalBytes) / \(maxbytes)", value: Double(totalBytes), total: Double(maxbytes))
+										.frame(width: 130)
+										.padding(5)
+										.font(.subheadline)
+										.accentColor(.accentColor)
+								}
+							}
+							.padding(.horizontal, 8)
+							.focused($focusedField, equals: .messageText)
+							.multilineTextAlignment(.leading)
+							.frame(minHeight: 100, maxHeight: 160)
+
+						Text(typingMessage).opacity(0).padding(.all, 0)
+
+					}
+					.overlay(RoundedRectangle(cornerRadius: 20).stroke(.tertiary, lineWidth: 1))
+					.padding(.bottom, 15)
+
+					Button(action: {
+						if bleManager.sendMessage(message: typingMessage, toUserNum: user.num) {
+							typingMessage = ""
+							focusedField = nil
+						} else {
+
+							_ = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { (_) in
+
+								if bleManager.sendMessage(message: typingMessage, toUserNum: user.num) {
+									typingMessage = ""
+								}
+							}
+						}
+
+					}) {
+						Image(systemName: "arrow.up.circle.fill").font(.largeTitle).foregroundColor(.blue)
+					}
+
+				}
+				.padding(.all, 15)
 			}
 		}
 		.navigationViewStyle(.stack)
@@ -56,5 +192,11 @@ struct UserMessageList: View {
 				}
 			}
 		}
+		.onAppear(perform: {
+			
+			self.bleManager.context = context
+
+	 })
     }
+
 }