diff --git a/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js b/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
index 828bf3fc5838fa000ec45ce424e0b3d9e16aeae8..2708ddc1ec8a3c626e049d0956bd4b116ed2c10b 100644
--- a/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
+++ b/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
@@ -4,4 +4,4 @@ import("system.result");
 import("MSTeams_lib");
 
 var isTeamsEnabled = vars.get("$param.ObjectId_param") in MSTeamsUtils.getTeamLinkContexts() && MSTeamsUtils.isTeamsEnabled();
-result.string(/*isTeamsEnabled ? neon.COMPONENTSTATE_EDITABLE : */neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(isTeamsEnabled ? neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index 2f279cf23fb22d886b2a3a7bce9c60edcf83206c..17cde5886a40df0410dcd5b3c9ea721f13d32cf1 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -78,9 +78,11 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
-    <entityActionField>
-      <name>importMessages</name>
-    </entityActionField>
+    <entityField>
+      <name>TeamMessages</name>
+      <consumer>Messages</consumer>
+      <selectionMode>MULTI</selectionMode>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
index 437ba4f01752bc9a118f40f47ce80f9fdb5b7e3c..8100af9bbee696961ab43850b8e49906237b4f00 100644
--- a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
+++ b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
@@ -57,6 +57,20 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityActionField>
+      <name>importMessages</name>
+      <title>Import</title>
+      <onActionProcess>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>loadNext</name>
+      <title>Next</title>
+      <onActionProcess>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>loadPrevious</name>
+      <title>Prev</title>
+    </entityActionField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js b/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b467cb15b6bb36560c56a74dd25e382679495f6
--- /dev/null
+++ b/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.logging");
+import("Util_lib");
+import("system.vars");
+
+var messages = vars.get("$sys.selection");
+var description = messages.map(function (id)
+{
+    var [user, date, message] = JSON.parse(id);
+    return "[" + user + " " + date + "]\n" + message + "\n";
+}).join("\n");
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, {
+    "Info_param": description
+});
\ No newline at end of file
diff --git a/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js b/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js b/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
index d8c0bad8a65f7fb8ad38753f002d20f1eb5f505a..0007cf9a2d5994cbbf002e496d12620d49ee358c 100644
--- a/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
@@ -31,7 +31,7 @@ else if (vars.get("$param.TeamId_param") && vars.get("$param.Channel_param"))
 messages = messages.map(function (message)
 {
     return [
-        util.getNewUUID(), 
+        JSON.stringify([message.author.userName, message.createdDateTime, message.message.message]), 
         message.author.userName, 
         message.message.message, 
         Date.parse(message.createdDateTime).toString()
diff --git a/neonContext/MSTeamsMessage/MSTeamsMessage.aod b/neonContext/MSTeamsMessage/MSTeamsMessage.aod
index ecf21a7e76897a9415073d8108020d36522d2d4d..3e2fdddb1fd203df7b6ab0bc1243e94fd3ab92d2 100644
--- a/neonContext/MSTeamsMessage/MSTeamsMessage.aod
+++ b/neonContext/MSTeamsMessage/MSTeamsMessage.aod
@@ -3,6 +3,7 @@
   <name>MSTeamsMessage</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterView>MSTeamsMessageFilter_view</filterView>
+  <lookupView>MSTeamsMessageFilter_view</lookupView>
   <entity>MSTeamsMessage_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod b/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
index a2f7266662173bd55c3192dda407a0c50e6555db..cd543c363d5dc8785a8aeaf4285a3103f87b3a2d 100644
--- a/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
+++ b/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
@@ -22,16 +22,9 @@
       </fields>
     </genericViewTemplate>
     <neonViewReference>
-      <name>e486a1bb-5deb-432a-aa28-c3872f0f88fc</name>
+      <name>59b3d882-d067-43eb-b19b-f52758c9d10b</name>
       <entityField>Messages</entityField>
       <view>MSTeamsMessageFilter_view</view>
     </neonViewReference>
-    <actionsViewTemplate>
-      <name>Actions</name>
-      <actions>
-        <element>loadNextMessages</element>
-      </actions>
-      <entityField>#ENTITY</entityField>
-    </actionsViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod b/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
index c9cae5e66e22ac705d668d977fdd66a478d86d1a..14b4fcec5a5044d3572264103fc4888e28f3dbb7 100644
--- a/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
+++ b/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
@@ -27,5 +27,11 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <actionsViewTemplate>
+      <name>ImportAction</name>
+      <actions>
+        <element>importMessages</element>
+      </actions>
+    </actionsViewTemplate>
   </children>
 </neonView>