diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
index e60170e11..daf27fa2d 100644
--- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
@@ -493,7 +493,7 @@ class UIViewModel @Inject constructor(
 
     fun updateActionPositions(actions: List<QuickChatAction>) {
         viewModelScope.launch(Dispatchers.Main) {
-            for (position in 0..actions.size) {
+            for (position in actions.indices) {
                 quickChatActionRepository.setItemPosition(actions[position].uuid, position)
             }
         }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index fb44c3a85..a6566ca72 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -307,15 +307,14 @@ class MessagesFragment : Fragment(), Logging {
 
         model.quickChatActions.asLiveData().observe(viewLifecycleOwner) { actions ->
             actions?.let {
+                // This seems kinda hacky it might be better to replace with a recycler view
                 binding.quickChatLayout.removeAllViews()
                 for (action in actions) {
                     val button = Button(context)
                     button.setText(action.name)
                     button.isEnabled = isConnected
                     if (action.mode == QuickChatAction.Mode.Instant) {
-                        //button.setBackgroundColor(Color.rgb(200, 200, 200))
                         button.backgroundTintList = ContextCompat.getColorStateList(requireActivity(), R.color.colorMyMsg)
-
                     }
                     button.setOnClickListener {
                         if (action.mode == QuickChatAction.Mode.Append) {