diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..9c8db12 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-12-18T06:11:01.262402900Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\natsu\.android\avd\Pixel_7_2.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
index 455723a..54b5478 100644
--- a/app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
+++ b/app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
@@ -148,13 +148,12 @@
 
         List<Activity> userActivities = userActivitiesLiveData.getValue();
 
+        // これまでは「先頭要素と同じ activityId なら更新しない」という判定をしていたが、
+        // 同じ activityId のままテキストだけ更新されるケース（編集など）の変化を拾えないため、
+        // activityId に関わらず常に最新を反映するようにする。
         if (userActivities == null || userActivities.isEmpty()) {
             userActivitiesLiveData.postValue(List.of(latestActivity));
         } else {
-            if (userActivities.get(0).getActivityId().equals(latestActivity.getActivityId())) {
-                return;
-            }
-
             userActivitiesLiveData.postValue(List.of(latestActivity));
         }
     }
diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
index 9911876..e4dca48 100644
--- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
@@ -418,6 +418,15 @@
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
+                            // FriendIconView を管理マップに保存
+                            userViews.put(friendId, container);
+
+                            // フレンドのアクティビティ更新を監視して吹き出しテキストを更新する
+                            MutableLiveData<List<Activity>> liveData =
+                                    activityViewModel.getActivitiesLiveDataFromUserId(friendId);
+                            if (liveData != null) {
+                                liveData.observe(MainActivity.this, container.getActivitiesObserver());
+                            }
                             container.setPadding(16, 16, 16, 16);
                             container.setId(View.generateViewId());