diff --git a/Dockerfile b/Dockerfile
index 8eb52f7d7..3fcea065f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/modialogin/modialogin-frontend:4da23e180b24161b5b23f9b425ba8e007a0251a8
+FROM ghcr.io/navikt/modialogin/modialogin-frontend:51338869e1398b8c18358eeddfa373fe8327e824
 ADD proxy-config.json /proxy-config.json
 ADD preprod-proxy-config.json /preprod-proxy-config.json
 COPY build /www
diff --git a/package-lock.json b/package-lock.json
index a5ac7299f..871e98bd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,6 @@
             "version": "0.4.2",
             "license": "MIT",
             "dependencies": {
-                "@navikt/ds-icons": "^2.0.1",
                 "@navikt/fnrvalidator": "^1.1.3",
                 "@navikt/navspa": "^4.0.0",
                 "@navikt/tag-input": "^2.0.1",
@@ -3608,9 +3607,9 @@
             }
         },
         "node_modules/@types/eslint-scope": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
-            "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+            "version": "3.7.4",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+            "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
             "dev": true,
             "dependencies": {
                 "@types/eslint": "*",
@@ -3618,9 +3617,9 @@
             }
         },
         "node_modules/@types/estree": {
-            "version": "0.0.50",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+            "version": "0.0.51",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+            "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
             "dev": true
         },
         "node_modules/@types/faker": {
@@ -4530,9 +4529,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.6.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-            "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
+            "version": "8.8.2",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -5855,9 +5854,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001352",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
-            "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==",
+            "version": "1.0.30001480",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz",
+            "integrity": "sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ==",
             "dev": true,
             "funding": [
                 {
@@ -5867,6 +5866,10 @@
                 {
                     "type": "tidelift",
                     "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
                 }
             ]
         },
@@ -7797,9 +7800,9 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+            "version": "5.12.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+            "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
             "dev": true,
             "dependencies": {
                 "graceful-fs": "^4.2.4",
@@ -10107,9 +10110,9 @@
             }
         },
         "node_modules/graceful-fs": {
-            "version": "4.2.6",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-            "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+            "version": "4.2.10",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
             "dev": true
         },
         "node_modules/gzip-size": {
@@ -21691,9 +21694,9 @@
             }
         },
         "node_modules/watchpack": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-            "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+            "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
             "dev": true,
             "dependencies": {
                 "glob-to-regexp": "^0.4.1",
@@ -21722,41 +21725,50 @@
             }
         },
         "node_modules/webpack": {
-            "version": "5.65.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
-            "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
+            "version": "5.76.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+            "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
             "dev": true,
             "dependencies": {
-                "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.50",
+                "@types/eslint-scope": "^3.7.3",
+                "@types/estree": "^0.0.51",
                 "@webassemblyjs/ast": "1.11.1",
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
-                "acorn": "^8.4.1",
+                "acorn": "^8.7.1",
                 "acorn-import-assertions": "^1.7.6",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.3",
+                "enhanced-resolve": "^5.10.0",
                 "es-module-lexer": "^0.9.0",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.4",
-                "json-parse-better-errors": "^1.0.2",
+                "graceful-fs": "^4.2.9",
+                "json-parse-even-better-errors": "^2.3.1",
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
                 "schema-utils": "^3.1.0",
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
-                "watchpack": "^2.3.1",
-                "webpack-sources": "^3.2.2"
+                "watchpack": "^2.4.0",
+                "webpack-sources": "^3.2.3"
             },
             "bin": {
                 "webpack": "bin/webpack.js"
             },
             "engines": {
                 "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
+                }
             }
         },
         "node_modules/webpack-dev-middleware": {
@@ -21964,9 +21976,9 @@
             }
         },
         "node_modules/webpack-sources": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
-            "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
             "dev": true,
             "engines": {
                 "node": ">=10.13.0"
@@ -25361,9 +25373,9 @@
             }
         },
         "@types/eslint-scope": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
-            "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+            "version": "3.7.4",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+            "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
             "dev": true,
             "requires": {
                 "@types/eslint": "*",
@@ -25371,9 +25383,9 @@
             }
         },
         "@types/estree": {
-            "version": "0.0.50",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+            "version": "0.0.51",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+            "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
             "dev": true
         },
         "@types/faker": {
@@ -26138,9 +26150,9 @@
             }
         },
         "acorn": {
-            "version": "8.6.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
-            "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
+            "version": "8.8.2",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
             "dev": true
         },
         "acorn-globals": {
@@ -27236,9 +27248,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001352",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
-            "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==",
+            "version": "1.0.30001480",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz",
+            "integrity": "sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ==",
             "dev": true
         },
         "capture-exit": {
@@ -28825,9 +28837,9 @@
             }
         },
         "enhanced-resolve": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+            "version": "5.12.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+            "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.2.4",
@@ -30658,9 +30670,9 @@
             }
         },
         "graceful-fs": {
-            "version": "4.2.6",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-            "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+            "version": "4.2.10",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
             "dev": true
         },
         "gzip-size": {
@@ -40075,9 +40087,9 @@
             }
         },
         "watchpack": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-            "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+            "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
             "dev": true,
             "requires": {
                 "glob-to-regexp": "^0.4.1",
@@ -40100,35 +40112,35 @@
             "dev": true
         },
         "webpack": {
-            "version": "5.65.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
-            "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
+            "version": "5.76.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+            "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
             "dev": true,
             "requires": {
-                "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.50",
+                "@types/eslint-scope": "^3.7.3",
+                "@types/estree": "^0.0.51",
                 "@webassemblyjs/ast": "1.11.1",
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
-                "acorn": "^8.4.1",
+                "acorn": "^8.7.1",
                 "acorn-import-assertions": "^1.7.6",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.3",
+                "enhanced-resolve": "^5.10.0",
                 "es-module-lexer": "^0.9.0",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.4",
-                "json-parse-better-errors": "^1.0.2",
+                "graceful-fs": "^4.2.9",
+                "json-parse-even-better-errors": "^2.3.1",
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
                 "schema-utils": "^3.1.0",
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
-                "watchpack": "^2.3.1",
-                "webpack-sources": "^3.2.2"
+                "watchpack": "^2.4.0",
+                "webpack-sources": "^3.2.3"
             },
             "dependencies": {
                 "eslint-scope": {
@@ -40335,9 +40347,9 @@
             }
         },
         "webpack-sources": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
-            "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
             "dev": true
         },
         "websocket-driver": {
diff --git a/src/app/internarbeidsflatedecorator/Decorator.tsx b/src/app/internarbeidsflatedecorator/Decorator.tsx
index c4ff92e28..1e4f905a1 100644
--- a/src/app/internarbeidsflatedecorator/Decorator.tsx
+++ b/src/app/internarbeidsflatedecorator/Decorator.tsx
@@ -130,7 +130,7 @@ function getHotkeys(): Hotkey[] {
      * Evt kan bruken av `useHotkey` hooken føre til at dette blir registrert i en global context som kan brukes her
      */
     const isProd = window.location.host === 'app.adeo.no';
-    const naisInternNavDomain = isProd ? '.intern.nav.no' : '.dev.intern.nav.no';
+    const naisInternNavDomain = isProd ? '.intern.nav.no' : '.intern.dev.nav.no';
     return [
         {
             key: { char: 'O', altKey: true },
diff --git a/src/app/personside/dialogpanel/DialogPanel.tsx b/src/app/personside/dialogpanel/DialogPanel.tsx
index 36be9d8bd..1fa0bc47b 100644
--- a/src/app/personside/dialogpanel/DialogPanel.tsx
+++ b/src/app/personside/dialogpanel/DialogPanel.tsx
@@ -8,11 +8,6 @@ import useVisTraadTilknyttetPlukketOppgave from './fortsettDialog/useVisTraadTil
 import { OppgavelisteValg } from './sendMelding/SendNyMelding';
 import LazySpinner from '../../../components/LazySpinner';
 import innstillingerResource from '../../../rest/resources/innstillingerResource';
-import IfFeatureToggleOn from '../../../components/featureToggle/IfFeatureToggleOn';
-import { FeatureToggles } from '../../../components/featureToggle/toggleIDs';
-import IfFeatureToggleOff from '../../../components/featureToggle/IfFeatureToggleOff';
-import NyFortsettDialogContainer from './fortsettDialog/NyFortsettDialogContainer';
-import NySendNyMeldingContainer from './sendMelding/NySendNyMeldingContainer';
 
 const DialogPanelWrapper = styled.div`
     flex-grow: 1;
@@ -38,31 +33,13 @@ function DialogPanel() {
         <ErrorBoundary boundaryName="Dialogpanel">
             <DialogPanelWrapper>
                 {dialogpanelTraad ? (
-                    <>
-                        <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                            <NyFortsettDialogContainer
-                                traad={dialogpanelTraad}
-                                defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
-                                key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
-                            />
-                        </IfFeatureToggleOn>
-                        <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                            <FortsettDialogContainer
-                                traad={dialogpanelTraad}
-                                defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
-                                key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
-                            />
-                        </IfFeatureToggleOff>
-                    </>
+                    <FortsettDialogContainer
+                        traad={dialogpanelTraad}
+                        defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
+                        key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
+                    />
                 ) : (
-                    <>
-                        <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                            <NySendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
-                        </IfFeatureToggleOn>
-                        <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                            <SendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
-                        </IfFeatureToggleOff>
-                    </>
+                    <SendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
                 )}
             </DialogPanelWrapper>
         </ErrorBoundary>
diff --git a/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap b/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap
index 8402db63b..99cf067e1 100644
--- a/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap
+++ b/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap
@@ -100,6 +100,21 @@ exports[`viser dialogpanel 1`] = `
   padding-left: 2.25rem;
 }
 
+.c16 {
+  margin-top: 1rem;
+}
+
+.c16 label {
+  position: absolute !important;
+  height: 1px;
+  width: 1px;
+  overflow: hidden;
+  -webkit-clip: rect(1px 1px 1px 1px);
+  clip: rect(1px 1px 1px 1px);
+  -webkit-clip: rect(1px,1px,1px,1px);
+  clip: rect(1px,1px,1px,1px);
+}
+
 .c5 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -158,7 +173,7 @@ exports[`viser dialogpanel 1`] = `
   padding: 1rem .5rem;
 }
 
-.c16 {
+.c18 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -168,7 +183,7 @@ exports[`viser dialogpanel 1`] = `
   flex-direction: column;
 }
 
-.c16 > * {
+.c18 > * {
   margin-bottom: 0.7rem;
 }
 
@@ -176,6 +191,10 @@ exports[`viser dialogpanel 1`] = `
   margin-top: 1rem;
 }
 
+.c17 {
+  margin-top: 1rem;
+}
+
 .c4 {
   margin-bottom: 1rem !important;
 }
@@ -477,7 +496,7 @@ exports[`viser dialogpanel 1`] = `
                 className="skjemaelement__label"
                 htmlFor="Helt tilfeldig ID"
               >
-                Referat telefon
+                Referat
               </label>
             </div>
             <div
@@ -496,26 +515,7 @@ exports[`viser dialogpanel 1`] = `
                 className="skjemaelement__label"
                 htmlFor="Helt tilfeldig ID"
               >
-                Referat oppmøte
-              </label>
-            </div>
-            <div
-              className="skjemaelement"
-            >
-              <input
-                aria-invalid={false}
-                checked={false}
-                className="skjemaelement__input radioknapp"
-                id="Helt tilfeldig ID"
-                name="dialogtype"
-                onChange={[Function]}
-                type="radio"
-              />
-              <label
-                className="skjemaelement__label"
-                htmlFor="Helt tilfeldig ID"
-              >
-                Spørsmål
+                Samtale
               </label>
             </div>
             <div
@@ -538,9 +538,7 @@ exports[`viser dialogpanel 1`] = `
               </label>
             </div>
           </div>
-          <div
-            className="SendNyMelding__Margin-h55t11-3"
-          >
+          <div>
             <fieldset
               aria-invalid={false}
               className="skjemagruppe"
@@ -650,65 +648,123 @@ exports[`viser dialogpanel 1`] = `
               </div>
             </div>
             <div
-              className="c15"
+              className="panel"
             >
-              <button
-                className="knapp knapp--hoved knapp--mini"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
+              <div
+                className="c15"
               >
-                Velg sak
-              </button>
-              <p
-                className="typo-normal"
+                <button
+                  className="knapp knapp--hoved knapp--mini"
+                  disabled={false}
+                  onClick={[Function]}
+                  type="button"
+                >
+                  Velg sak
+                </button>
+                <p
+                  className="typo-normal"
+                >
+                  Ingen valgt sak
+                </p>
+              </div>
+              <div
+                className="skjemaelement c16"
               >
-                Ingen valgt sak
-              </p>
-            </div>
-            <div
-              className="alertstripe c14 alertstripe--info"
-            >
-              <span
-                className="alertstripe__ikon"
+                <label
+                  className="skjemaelement__label"
+                  htmlFor="Helt tilfeldig ID"
+                >
+                  Oppgaveliste
+                </label>
+                <div
+                  className="selectContainer input--fullbredde"
+                >
+                  <select
+                    aria-invalid={false}
+                    className="skjemaelement__input"
+                    disabled={false}
+                    id="Helt tilfeldig ID"
+                    onChange={[Function]}
+                    value="MinListe"
+                  >
+                    <option
+                      value="MinListe"
+                    >
+                      Svar skal til min oppgaveliste hos 
+                      valgt enhet
+                    </option>
+                    <option
+                      value="Enhetensliste"
+                    >
+                      Svar skal til 
+                      valgt enhet
+                       sin oppgaveliste
+                    </option>
+                  </select>
+                </div>
+              </div>
+              <div
+                className="alertstripe c14 alertstripe--info"
               >
                 <span
-                  className="sr-only"
+                  className="alertstripe__ikon"
                 >
-                  info
+                  <span
+                    className="sr-only"
+                  >
+                    info
+                  </span>
+                  <svg
+                    aria-label="info-ikon"
+                    focusable="false"
+                    height="1.5em"
+                    kind="info-sirkel-fyll"
+                    role="img"
+                    viewBox="0 0 24 24"
+                    width="1.5em"
+                  >
+                    <g
+                      fill="none"
+                    >
+                      <path
+                        d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
+                        fill="#337C9B"
+                      />
+                      <path
+                        d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
+                        fill="#FFF"
+                      />
+                    </g>
+                  </svg>
                 </span>
-                <svg
-                  aria-label="info-ikon"
-                  focusable="false"
-                  height="1.5em"
-                  kind="info-sirkel-fyll"
-                  role="img"
-                  viewBox="0 0 24 24"
-                  width="1.5em"
+                <div
+                  className="typo-normal alertstripe__tekst"
                 >
-                  <g
-                    fill="none"
-                  >
-                    <path
-                      d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
-                      fill="#337C9B"
-                    />
-                    <path
-                      d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
-                      fill="#FFF"
-                    />
-                  </g>
-                </svg>
-              </span>
+                  Gir varsel, bruker må svare
+                </div>
+              </div>
               <div
-                className="typo-normal alertstripe__tekst"
+                className="skjemaelement c17"
               >
-                Gir varsel, bruker kan ikke svare
+                <input
+                  aria-invalid={false}
+                  checked={false}
+                  className="skjemaelement__input checkboks"
+                  id="Helt tilfeldig ID"
+                  onChange={[Function]}
+                  type="checkbox"
+                />
+                <label
+                  className="skjemaelement__label"
+                  htmlFor="Helt tilfeldig ID"
+                >
+                  Avslutt samtale etter sending
+                </label>
               </div>
             </div>
           </div>
           <div
-            className="c16"
+            className="c18"
           >
             <button
               className="knapp knapp--hoved"
diff --git a/src/app/personside/dialogpanel/fellesStyling.tsx b/src/app/personside/dialogpanel/fellesStyling.tsx
index 2408c9934..620c39fa3 100644
--- a/src/app/personside/dialogpanel/fellesStyling.tsx
+++ b/src/app/personside/dialogpanel/fellesStyling.tsx
@@ -5,8 +5,7 @@ import * as React from 'react';
 import KnappBase from 'nav-frontend-knapper';
 import VisuallyHiddenAutoFokusHeader from '../../../components/VisuallyHiddenAutoFokusHeader';
 import Preview from './Preview';
-import { Meldingstype, Traad } from '../../../models/meldinger/meldinger';
-import { meldingstypeTekst } from '../infotabs/meldinger/utils/meldingstekster';
+import { Traad } from '../../../models/meldinger/meldinger';
 import Verktoylinje from '../infotabs/meldinger/traadvisning/verktoylinje/Verktoylinje';
 import NavFrontendSpinner from 'nav-frontend-spinner';
 import FillCenterAndFadeIn from '../../../components/FillCenterAndFadeIn';
@@ -16,6 +15,7 @@ import TidligereMeldinger from './fortsettDialog/tidligereMeldinger/TidligereMel
 import ErrorBoundary from '../../../components/ErrorBoundary';
 import { SendNyMeldingStatus } from './sendMelding/SendNyMeldingTypes';
 import Panel from 'nav-frontend-paneler';
+import { traadstittel } from '../infotabs/meldinger/utils/meldingerUtils';
 
 export const FormStyle = styled.form`
     display: flex;
@@ -38,6 +38,7 @@ export const DialogpanelKvitteringStyling = styled.div`
     padding: 1rem ${theme.margin.layout};
     ${theme.animation.fadeIn};
 `;
+
 const SpinnerWrapper = styled(FillCenterAndFadeIn)`
     box-shadow: none;
     border: ${theme.border.skille};
@@ -83,7 +84,6 @@ function VarselTilBrukerOmStatus(props: { meldingstatus: SendNyMeldingStatus; ti
 export function DialogpanelKvittering(props: {
     tittel: string;
     fritekst: string;
-    meldingstype: Meldingstype;
     lukk: () => void;
     traad?: Traad;
     meldingstatus: SendNyMeldingStatus;
@@ -99,12 +99,14 @@ export function DialogpanelKvittering(props: {
                     </ErrorBoundary>
                 )}
                 <ErrorBoundary boundaryName="Sendt melding preview">
-                    <Preview
-                        fritekst={props.fritekst}
-                        tittel={meldingstypeTekst(props.meldingstype)}
-                        meldingstatus={props.meldingstatus}
-                        traad={props.traad}
-                    />
+                    {props.traad && (
+                        <Preview
+                            fritekst={props.fritekst}
+                            tittel={traadstittel(props.traad)}
+                            meldingstatus={props.meldingstatus}
+                            traad={props.traad}
+                        />
+                    )}
                 </ErrorBoundary>
                 {props.meldingstatus !== SendNyMeldingStatus.ERROR && (
                     <ErrorBoundary boundaryName="Sendt melding verktøylinje">
diff --git a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialog.tsx b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialog.tsx
index b2a0131b1..ddfa90cc7 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialog.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialog.tsx
@@ -1,37 +1,38 @@
 import * as React from 'react';
 import { FormEvent } from 'react';
-import { AlertStripeInfo } from 'nav-frontend-alertstriper';
-import { Meldingstype, Traad } from '../../../../models/meldinger/meldinger';
+import { AlertStripeFeil, AlertStripeInfo } from 'nav-frontend-alertstriper';
+import { Traad, TraadType } from '../../../../models/meldinger/meldinger';
 import TidligereMeldinger from './tidligereMeldinger/TidligereMeldinger';
-import VelgDialogType from './VelgDialogType';
 import TekstFelt from '../sendMelding/TekstFelt';
 import { UnmountClosed } from 'react-collapse';
 import { Hovedknapp } from 'nav-frontend-knapper';
 import { DialogpanelFeilmelding, FormStyle } from '../fellesStyling';
 import KnappMedBekreftPopup from '../../../../components/KnappMedBekreftPopup';
-import BrukerKanSvare from './BrukerKanSvare';
 import styled from 'styled-components/macro';
 import { FortsettDialogValidator } from './validatorer';
 import { DialogPanelStatus, FortsettDialogPanelState, FortsettDialogState } from './FortsettDialogTypes';
-import {
-    eldsteMelding,
-    erJournalfort,
-    erMeldingstypeSamtalereferat
-} from '../../infotabs/meldinger/utils/meldingerUtils';
+import { erJournalfort } from '../../infotabs/meldinger/utils/meldingerUtils';
 import { capitalizeName } from '../../../../utils/string-utils';
 import persondataResource from '../../../../rest/resources/persondataResource';
+import { Checkbox, SkjemaelementFeilmelding } from 'nav-frontend-skjema';
+import Panel from 'nav-frontend-paneler';
+import Oppgaveliste from '../sendMelding/Oppgaveliste';
+import DialogpanelVelgSak from '../sendMelding/DialogpanelVelgSak';
 
 const SubmitKnapp = styled(Hovedknapp)`
     white-space: normal;
-    margin-top: 1rem;
 `;
 
 const StyledKnappMedBekreftPopup = styled(KnappMedBekreftPopup)`
     width: 100%;
 `;
 
-const Margin = styled.div`
-    /* Pga React Collapse må vi slenge på noen div'er som tar seg av marginer for å unngå hopp i animasjon */
+const StyledAlertStripeInfo = styled(AlertStripeInfo)`
+    margin-top: 1rem;
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-top: 1rem;
 `;
 
 interface Props {
@@ -45,17 +46,18 @@ interface Props {
     fortsettDialogPanelState: FortsettDialogPanelState;
 }
 
-function Feilmelding(props: { status: DialogPanelStatus }) {
+function Feilmelding(props: { status: DialogPanelStatus; errors?: Error[] }) {
     if (props.status === DialogPanelStatus.ERROR) {
         return <DialogpanelFeilmelding />;
     }
-    return null;
-}
 
-function useVarselInfotekst(meldingstype: Meldingstype): string {
-    return meldingstype === Meldingstype.SVAR_SKRIFTLIG
-        ? 'Gir varsel, dialogen avsluttes. Det er ikke mulig å sende flere meldinger i denne dialogen i ettertid.'
-        : 'Gir varsel, bruker kan svare.';
+    if (props.errors) {
+        props.errors.map((error) => {
+            return <AlertStripeFeil>{error.message}</AlertStripeFeil>;
+        });
+    }
+
+    return null;
 }
 
 export const tekstMaksLengde = 5000;
@@ -74,10 +76,11 @@ function FortsettDialog(props: Props) {
         temaKode: jp.journalfortTema,
         saksId: jp.journalfortSaksid
     }));
-    const varselInfotekst = useVarselInfotekst(state.dialogType);
 
-    const melding = eldsteMelding(props.traad);
-    const erSamtalereferat = erMeldingstypeSamtalereferat(melding.meldingstype);
+    const erSamtalereferat = props.traad.traadType === TraadType.SAMTALEREFERAT;
+    const visFeilmelding = !FortsettDialogValidator.sak(state) && state.visFeilmeldinger;
+    const visVelgSak = !erJournalfort(props.traad) && !erOksosTraad;
+
     return (
         <FormStyle onSubmit={handleSubmit}>
             <TidligereMeldinger traad={props.traad} />
@@ -92,30 +95,40 @@ function FortsettDialog(props: Props) {
                         : undefined
                 }
             />
-            <VelgDialogType
-                formState={state}
-                updateDialogType={(dialogType) => updateState({ dialogType: dialogType })}
-                erTilknyttetOppgave={props.erTilknyttetOppgave}
-                erSTOOppgave={props.erSTOOppgave}
-                erOksosTraad={erOksosTraad}
-                erSamtalereferat={erSamtalereferat}
-            />
-            <Margin>
+
+            <div>
                 <UnmountClosed isOpened={!erSamtalereferat}>
-                    <AlertStripeInfo>{varselInfotekst}</AlertStripeInfo>
-                    <BrukerKanSvare
-                        formState={state}
-                        updateFormState={updateState}
-                        visVelgSak={
-                            !erJournalfort(props.traad) &&
-                            !erOksosTraad &&
-                            state.dialogType === Meldingstype.SPORSMAL_MODIA_UTGAAENDE
-                        }
-                        eksisterendeSaker={eksisterendeSaker}
-                    />
+                    <Panel>
+                        {visVelgSak && (
+                            <DialogpanelVelgSak
+                                setValgtSak={(sak) => updateState({ sak: sak })}
+                                valgtSak={state.sak}
+                                visFeilmelding={visFeilmelding}
+                                eksisterendeSaker={eksisterendeSaker}
+                            />
+                        )}
+
+                        {visVelgSak && visFeilmelding && (
+                            <SkjemaelementFeilmelding>Du må velge sak </SkjemaelementFeilmelding>
+                        )}
+
+                        {!state.avsluttet ? (
+                            <Oppgaveliste
+                                oppgaveliste={state.oppgaveListe}
+                                setOppgaveliste={(oppgaveliste) => updateState({ oppgaveListe: oppgaveliste })}
+                            />
+                        ) : (
+                            <StyledAlertStripeInfo>Bruker kan ikke skrive mer i denne samtalen</StyledAlertStripeInfo>
+                        )}
+                        <StyledCheckbox
+                            label={'Avslutt samtale etter sending'}
+                            checked={state.avsluttet}
+                            onChange={() => updateState({ avsluttet: !state.avsluttet })}
+                        />
+                    </Panel>
                 </UnmountClosed>
-            </Margin>
-            <Feilmelding status={props.fortsettDialogPanelState.type} />
+            </div>
+            <Feilmelding status={props.fortsettDialogPanelState.type} errors={props.state.errors} />
             <SubmitKnapp htmlType="submit" spinner={props.fortsettDialogPanelState.type === DialogPanelStatus.POSTING}>
                 {delMedBrukerTekst}
             </SubmitKnapp>
diff --git a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
index 4507937a9..98d6fb56b 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { FormEvent, useRef, useState, useCallback, useMemo } from 'react';
-import FortsettDialog from './FortsettDialog';
 import { FortsettDialogValidator } from './validatorer';
-import { ForsettDialogRequest, Meldingstype, Traad } from '../../../../models/meldinger/meldinger';
+import { SendMeldingRequest, Traad, TraadType } from '../../../../models/meldinger/meldinger';
 import { setIngenValgtTraadDialogpanel } from '../../../../redux/oppgave/actions';
 import { useFodselsnummer } from '../../../../utils/customHooks';
 import { useDispatch } from 'react-redux';
@@ -32,12 +31,7 @@ import dialogResource from '../../../../rest/resources/dialogResource';
 import { useValgtenhet } from '../../../../context/valgtenhet-state';
 import { useQueryClient, UseQueryResult } from '@tanstack/react-query';
 import journalsakResource from '../../../../rest/resources/journalsakResource';
-
-export type FortsettDialogType =
-    | Meldingstype.SVAR_SKRIFTLIG
-    | Meldingstype.SPORSMAL_MODIA_UTGAAENDE
-    | Meldingstype.SAMTALEREFERAT_OPPMOTE
-    | Meldingstype.SAMTALEREFERAT_TELEFON;
+import FortsettDialog from './FortsettDialog';
 
 interface Props {
     traad: Traad;
@@ -69,13 +63,14 @@ function FortsettDialogContainer(props: Props) {
     const initialState = useMemo(
         () => ({
             tekst: '',
-            dialogType: Meldingstype.SVAR_SKRIFTLIG as FortsettDialogType,
-            tema: undefined,
+            traadType: props.traad.traadType ?? TraadType.SAMTALEREFERAT,
+            temagruppe: undefined,
             visFeilmeldinger: false,
             sak: undefined,
-            oppgaveListe: props.defaultOppgaveDestinasjon
+            oppgaveListe: props.defaultOppgaveDestinasjon,
+            avsluttet: false
         }),
-        [props.defaultOppgaveDestinasjon]
+        [props.defaultOppgaveDestinasjon, props.traad.traadType]
     );
 
     const fnr = useFodselsnummer();
@@ -137,26 +132,24 @@ function FortsettDialogContainer(props: Props) {
         const commonPayload = {
             enhet: valgtEnhet,
             fritekst: state.tekst,
-            meldingstype: state.dialogType,
             traadId: props.traad.traadId,
+            traadType: state.traadType,
+            temagruppe: props.traad.temagruppe,
             behandlingsId: opprettHenvendelse.henvendelse.behandlingsId,
-            oppgaveId: oppgaveId
+            oppgaveId: oppgaveId,
+            avsluttet: state.avsluttet
         };
-        if (
-            FortsettDialogValidator.erGyldigSvarSkriftlig(state) ||
-            FortsettDialogValidator.erGyldigSamtalereferat(state)
-        ) {
+        if (FortsettDialogValidator.erGyldigSamtalereferat(state)) {
             setDialogStatus({ type: DialogPanelStatus.POSTING });
-            const request: ForsettDialogRequest = {
+            const request: SendMeldingRequest = {
                 ...commonPayload,
-                erOppgaveTilknyttetAnsatt: true // TODO, denne bør ikke være nødvendig å sende med her
+                erOppgaveTilknyttetAnsatt: true
             };
             const kvitteringsData: KvitteringsData = {
                 fritekst: request.fritekst,
-                meldingstype: request.meldingstype,
                 traad: props.traad
             };
-            post(`${apiBaseUri}/dialog/${fnr}/fortsett/ferdigstill`, request, 'Send-Svar')
+            post(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Svar')
                 .then(() => {
                     callback();
                     setDialogStatus({ type: DialogPanelStatus.SVAR_SENDT, kvitteringsData: kvitteringsData });
@@ -164,7 +157,7 @@ function FortsettDialogContainer(props: Props) {
                 .catch(() => {
                     setDialogStatus({ type: DialogPanelStatus.ERROR });
                 });
-        } else if (FortsettDialogValidator.erGyldigSporsmaalSkriftlig(state, props.traad)) {
+        } else if (FortsettDialogValidator.erGyldigSamtale(state)) {
             const tradErJournalfort = erJournalfort(props.traad);
             const erOksos = props.traad.meldinger[0].temagruppe === Temagruppe.ØkonomiskSosial;
             if (!state.sak && !tradErJournalfort && !erOksos) {
@@ -173,20 +166,20 @@ function FortsettDialogContainer(props: Props) {
                 );
                 console.error(error);
                 loggError(error);
+                updateState({ errors: [error], visFeilmeldinger: true });
                 return;
             }
             setDialogStatus({ type: DialogPanelStatus.POSTING });
-            const request: ForsettDialogRequest = {
+            const request: SendMeldingRequest = {
                 ...commonPayload,
-                erOppgaveTilknyttetAnsatt: erOppgaveTilknyttetAnsatt,
+                erOppgaveTilknyttetAnsatt: state.avsluttet ? false : erOppgaveTilknyttetAnsatt,
                 sak: state.sak ? state.sak : undefined
             };
             const kvitteringsData: KvitteringsData = {
                 fritekst: request.fritekst,
-                meldingstype: request.meldingstype,
                 traad: props.traad
             };
-            post(`${apiBaseUri}/dialog/${fnr}/fortsett/ferdigstill`, request, 'Svar-Med-Spørsmål')
+            post(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Svar-Med-Spørsmål')
                 .then(() => {
                     callback();
                     queryClient.invalidateQueries(journalsakResource.queryKey(fnr));
@@ -196,14 +189,28 @@ function FortsettDialogContainer(props: Props) {
                     setDialogStatus({ type: DialogPanelStatus.ERROR });
                 });
         } else {
-            updateState({ visFeilmeldinger: true });
+            const error = Error('Det skjedde en feil ved sending av melding');
+            updateState({ errors: [error], visFeilmeldinger: true });
         }
     };
 
+    function traadTittel(traadType?: TraadType) {
+        switch (traadType) {
+            case TraadType.CHAT:
+                return 'Fortsett chat';
+            case TraadType.MELDINGSKJEDE:
+                return 'Fortsett samtale';
+            case TraadType.SAMTALEREFERAT:
+                return 'Påfølgende referat';
+            default:
+                return '';
+        }
+    }
+
     return (
         <StyledArticle aria-labelledby={tittelId.current}>
             <ReflowBoundry>
-                <Undertittel id={tittelId.current}>Fortsett dialog</Undertittel>
+                <Undertittel id={tittelId.current}>{traadTittel(props.traad.traadType)}</Undertittel>
                 <FortsettDialog
                     handleAvbryt={handleAvbryt}
                     state={state}
diff --git a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogKvittering.tsx b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogKvittering.tsx
index 1cc2a2829..d01a8cca5 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogKvittering.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogKvittering.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { DialogpanelKvittering } from '../fellesStyling';
+import { DialogpanelKvittering } from '../nyFellesStyling';
 import { useDispatch } from 'react-redux';
 import { setIngenValgtTraadDialogpanel } from '../../../../redux/oppgave/actions';
 import { KvitteringsData } from './FortsettDialogTypes';
@@ -12,7 +12,6 @@ export function SvarSendtKvittering(props: { kvitteringsData: KvitteringsData })
         <DialogpanelKvittering
             tittel="Svar ble sendt"
             fritekst={props.kvitteringsData.fritekst}
-            meldingstype={props.kvitteringsData.meldingstype}
             traad={props.kvitteringsData.traad}
             lukk={() => {
                 dispatch(setIngenValgtTraadDialogpanel());
diff --git a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogTypes.ts b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogTypes.ts
index c3add4725..ac965ee84 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogTypes.ts
+++ b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogTypes.ts
@@ -1,7 +1,6 @@
-import { Meldingstype, Traad } from '../../../../models/meldinger/meldinger';
+import { Traad, TraadType } from '../../../../models/meldinger/meldinger';
 import { OppgavelisteValg } from '../sendMelding/SendNyMelding';
 import { JournalforingsSak } from '../../infotabs/meldinger/traadvisning/verktoylinje/journalforing/JournalforingPanel';
-import { FortsettDialogType } from './FortsettDialogContainer';
 import { Temagruppe } from '../../../../models/temagrupper';
 
 export enum DialogPanelStatus {
@@ -13,7 +12,6 @@ export enum DialogPanelStatus {
 
 export type KvitteringsData = {
     fritekst: string;
-    meldingstype: Meldingstype;
     temagruppe?: Temagruppe;
     traad: Traad;
 };
@@ -35,10 +33,11 @@ export type FortsettDialogPanelState = UnderArbeid | SvarSendtSuccess;
 
 export interface FortsettDialogState {
     tekst: string;
-    dialogType: FortsettDialogType;
+    traadType: TraadType;
     temagruppe?: Temagruppe;
     oppgaveListe: OppgavelisteValg;
     sak?: JournalforingsSak;
     visFeilmeldinger: boolean;
+    errors?: Error[];
     avsluttet?: boolean;
 }
diff --git a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialog.tsx b/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialog.tsx
deleted file mode 100644
index 902b97e9a..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialog.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as React from 'react';
-import { FormEvent } from 'react';
-import { AlertStripeFeil, AlertStripeInfo } from 'nav-frontend-alertstriper';
-import { Traad, TraadType } from '../../../../models/meldinger/meldinger';
-import TidligereMeldinger from './tidligereMeldinger/TidligereMeldinger';
-import TekstFelt from '../sendMelding/TekstFelt';
-import { UnmountClosed } from 'react-collapse';
-import { Hovedknapp } from 'nav-frontend-knapper';
-import { DialogpanelFeilmelding, FormStyle } from '../fellesStyling';
-import KnappMedBekreftPopup from '../../../../components/KnappMedBekreftPopup';
-import styled from 'styled-components/macro';
-import { FortsettDialogValidator } from './nyValidatorer';
-import { DialogPanelStatus, FortsettDialogPanelState, FortsettDialogState } from './NyFortsettDialogTypes';
-import { erJournalfort } from '../../infotabs/meldinger/utils/meldingerUtils';
-import { capitalizeName } from '../../../../utils/string-utils';
-import persondataResource from '../../../../rest/resources/persondataResource';
-import { Checkbox, SkjemaelementFeilmelding } from 'nav-frontend-skjema';
-import Panel from 'nav-frontend-paneler';
-import Oppgaveliste from '../sendMelding/Oppgaveliste';
-import DialogpanelVelgSak from '../sendMelding/DialogpanelVelgSak';
-
-const SubmitKnapp = styled(Hovedknapp)`
-    white-space: normal;
-`;
-
-const StyledKnappMedBekreftPopup = styled(KnappMedBekreftPopup)`
-    width: 100%;
-`;
-
-const StyledAlertStripeInfo = styled(AlertStripeInfo)`
-    margin-top: 1rem;
-`;
-
-const StyledCheckbox = styled(Checkbox)`
-    margin-top: 1rem;
-`;
-
-interface Props {
-    handleSubmit: (event: FormEvent) => void;
-    handleAvbryt: () => void;
-    state: FortsettDialogState;
-    updateState: (change: Partial<FortsettDialogState>) => void;
-    traad: Traad;
-    erTilknyttetOppgave: boolean;
-    erSTOOppgave: boolean;
-    fortsettDialogPanelState: FortsettDialogPanelState;
-}
-
-function Feilmelding(props: { status: DialogPanelStatus; errors?: Error[] }) {
-    if (props.status === DialogPanelStatus.ERROR) {
-        return <DialogpanelFeilmelding />;
-    }
-
-    if (props.errors) {
-        props.errors.map((error) => {
-            return <AlertStripeFeil>{error.message}</AlertStripeFeil>;
-        });
-    }
-
-    return null;
-}
-
-export const tekstMaksLengde = 5000;
-
-function NyFortsettDialog(props: Props) {
-    const { state, updateState, handleAvbryt, handleSubmit } = props;
-    const personResponse = persondataResource.useFetch();
-
-    const navn = personResponse.data
-        ? capitalizeName(personResponse.data.person.navn.firstOrNull()?.fornavn || '')
-        : 'bruker';
-
-    const delMedBrukerTekst = props.erTilknyttetOppgave ? `Del med ${navn} og avslutt oppgave` : `Del med ${navn}`;
-    const erOksosTraad = props.traad.meldinger.some((it) => it.temagruppe === 'OKSOS');
-    const eksisterendeSaker = props.traad.journalposter.map((jp) => ({
-        temaKode: jp.journalfortTema,
-        saksId: jp.journalfortSaksid
-    }));
-
-    const erSamtalereferat = props.traad.traadType === TraadType.SAMTALEREFERAT;
-    const visFeilmelding = !FortsettDialogValidator.sak(state) && state.visFeilmeldinger;
-    const visVelgSak = !erJournalfort(props.traad) && !erOksosTraad;
-
-    return (
-        <FormStyle onSubmit={handleSubmit}>
-            <TidligereMeldinger traad={props.traad} />
-            <TekstFelt
-                tekst={state.tekst}
-                navn={navn}
-                tekstMaksLengde={tekstMaksLengde}
-                updateTekst={(tekst) => updateState({ tekst: tekst })}
-                feilmelding={
-                    !FortsettDialogValidator.tekst(state) && state.visFeilmeldinger
-                        ? `Du må skrive en tekst på mellom 1 og ${tekstMaksLengde} tegn`
-                        : undefined
-                }
-            />
-
-            <div>
-                <UnmountClosed isOpened={!erSamtalereferat}>
-                    <Panel>
-                        {visVelgSak && (
-                            <DialogpanelVelgSak
-                                setValgtSak={(sak) => updateState({ sak: sak })}
-                                valgtSak={state.sak}
-                                visFeilmelding={visFeilmelding}
-                                eksisterendeSaker={eksisterendeSaker}
-                            />
-                        )}
-
-                        {visVelgSak && visFeilmelding && (
-                            <SkjemaelementFeilmelding>Du må velge sak </SkjemaelementFeilmelding>
-                        )}
-
-                        {!state.avsluttet ? (
-                            <Oppgaveliste
-                                oppgaveliste={state.oppgaveListe}
-                                setOppgaveliste={(oppgaveliste) => updateState({ oppgaveListe: oppgaveliste })}
-                            />
-                        ) : (
-                            <StyledAlertStripeInfo>Bruker kan ikke skrive mer i denne samtalen</StyledAlertStripeInfo>
-                        )}
-                        <StyledCheckbox
-                            label={'Avslutt samtale etter sending'}
-                            checked={state.avsluttet}
-                            onChange={() => updateState({ avsluttet: !state.avsluttet })}
-                        />
-                    </Panel>
-                </UnmountClosed>
-            </div>
-            <Feilmelding status={props.fortsettDialogPanelState.type} errors={props.state.errors} />
-            <SubmitKnapp htmlType="submit" spinner={props.fortsettDialogPanelState.type === DialogPanelStatus.POSTING}>
-                {delMedBrukerTekst}
-            </SubmitKnapp>
-            {!props.erTilknyttetOppgave && (
-                <StyledKnappMedBekreftPopup
-                    htmlType="reset"
-                    type="flat"
-                    onBekreft={handleAvbryt}
-                    bekreftKnappTekst={'Ja, avbryt'}
-                    popUpTekst="Er du sikker på at du vil avbryte? Du mister da meldinger du har påbegynt."
-                >
-                    Avbryt
-                </StyledKnappMedBekreftPopup>
-            )}
-        </FormStyle>
-    );
-}
-
-export default NyFortsettDialog;
diff --git a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogContainer.tsx b/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogContainer.tsx
deleted file mode 100644
index 9feb00c81..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogContainer.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import * as React from 'react';
-import { FormEvent, useRef, useState, useCallback, useMemo } from 'react';
-import { FortsettDialogValidator } from './nyValidatorer';
-import { SendMeldingRequest, Traad, TraadType } from '../../../../models/meldinger/meldinger';
-import { setIngenValgtTraadDialogpanel } from '../../../../redux/oppgave/actions';
-import { useFodselsnummer } from '../../../../utils/customHooks';
-import { useDispatch } from 'react-redux';
-import { OppgavelisteValg } from '../sendMelding/SendNyMelding';
-import { SvarSendtKvittering } from './NyFortsettDialogKvittering';
-import useOpprettHenvendelse from './useOpprettHenvendelse';
-import { erJournalfort } from '../../infotabs/meldinger/utils/meldingerUtils';
-import { loggError } from '../../../../utils/logger/frontendLogger';
-import { FetchError, post } from '../../../../api/api';
-import { apiBaseUri } from '../../../../api/config';
-import {
-    DialogPanelStatus,
-    FortsettDialogPanelState,
-    FortsettDialogState,
-    KvitteringsData
-} from './NyFortsettDialogTypes';
-import { Undertittel } from 'nav-frontend-typografi';
-import { guid } from 'nav-frontend-js-utils';
-import styled from 'styled-components';
-import theme from '../../../../styles/personOversiktTheme';
-import ReflowBoundry from '../ReflowBoundry';
-import { Temagruppe } from '../../../../models/temagrupper';
-import useDraft, { Draft } from '../use-draft';
-import { Oppgave } from '../../../../models/meldinger/oppgave';
-import tildelteoppgaver from '../../../../rest/resources/tildelteoppgaverResource';
-import dialogResource from '../../../../rest/resources/dialogResource';
-import { useValgtenhet } from '../../../../context/valgtenhet-state';
-import { useQueryClient, UseQueryResult } from '@tanstack/react-query';
-import journalsakResource from '../../../../rest/resources/journalsakResource';
-import NyFortsettDialog from './NyFortsettDialog';
-
-interface Props {
-    traad: Traad;
-    defaultOppgaveDestinasjon: OppgavelisteValg;
-}
-
-const StyledArticle = styled.article`
-    padding: 1rem ${theme.margin.layout};
-`;
-
-export function finnPlukketOppgaveForTraad(
-    traad: Traad,
-    resource: UseQueryResult<Oppgave[], FetchError>
-): { oppgave: Oppgave | undefined; erSTOOppgave: boolean } {
-    if (!resource.data) {
-        return { oppgave: undefined, erSTOOppgave: false };
-    } else {
-        const oppgave: Oppgave | undefined = resource.data.find(
-            (oppgave: Oppgave) => oppgave.traadId === traad.traadId
-        );
-        const erSTOOppgave = oppgave !== undefined && oppgave.erSTOOppgave;
-
-        return { oppgave, erSTOOppgave };
-    }
-}
-
-function NyFortsettDialogContainer(props: Props) {
-    const queryClient = useQueryClient();
-    const initialState = useMemo(
-        () => ({
-            tekst: '',
-            traadType: props.traad.traadType ?? TraadType.SAMTALEREFERAT,
-            temagruppe: undefined,
-            visFeilmeldinger: false,
-            sak: undefined,
-            oppgaveListe: props.defaultOppgaveDestinasjon,
-            avsluttet: false
-        }),
-        [props.defaultOppgaveDestinasjon, props.traad.traadType]
-    );
-
-    const fnr = useFodselsnummer();
-    const tittelId = useRef(guid());
-    const [state, setState] = useState<FortsettDialogState>(initialState);
-    const valgtEnhet = useValgtenhet().enhetId;
-    const draftLoader = useCallback(
-        (draft: Draft) => setState((current) => ({ ...current, tekst: draft.content })),
-        [setState]
-    );
-    const draftContext = useMemo(() => ({ fnr }), [fnr]);
-    const { update: updateDraft, remove: removeDraft } = useDraft(draftContext, draftLoader);
-    const tildelteOppgaverResource = tildelteoppgaver.useFetch();
-    const [dialogStatus, setDialogStatus] = useState<FortsettDialogPanelState>({
-        type: DialogPanelStatus.UNDER_ARBEID
-    });
-    const dispatch = useDispatch();
-    const updateState = useCallback(
-        (change: Partial<FortsettDialogState>) =>
-            setState((currentState) => {
-                if (change.tekst !== undefined) {
-                    updateDraft(change.tekst);
-                }
-                return { ...currentState, visFeilmeldinger: false, ...change };
-            }),
-        [setState, updateDraft]
-    );
-
-    const opprettHenvendelse = useOpprettHenvendelse(props.traad);
-
-    if (dialogStatus.type === DialogPanelStatus.SVAR_SENDT) {
-        return <SvarSendtKvittering kvitteringsData={dialogStatus.kvitteringsData} />;
-    }
-
-    if (opprettHenvendelse.success === false) {
-        return opprettHenvendelse.placeholder;
-    }
-
-    const { oppgave, erSTOOppgave } = finnPlukketOppgaveForTraad(props.traad, tildelteOppgaverResource);
-    const oppgaveId = oppgave ? oppgave.oppgaveId : opprettHenvendelse.henvendelse.oppgaveId;
-
-    const handleAvbryt = () => {
-        removeDraft();
-        dispatch(setIngenValgtTraadDialogpanel());
-    };
-
-    const handleSubmit = (event: FormEvent) => {
-        event.preventDefault();
-        if (dialogStatus.type === DialogPanelStatus.POSTING) {
-            return;
-        }
-        const callback = () => {
-            removeDraft();
-            tildelteOppgaverResource.refetch();
-            queryClient.invalidateQueries(dialogResource.queryKey(fnr, valgtEnhet));
-        };
-
-        const erOppgaveTilknyttetAnsatt = state.oppgaveListe === OppgavelisteValg.MinListe;
-        const commonPayload = {
-            enhet: valgtEnhet,
-            fritekst: state.tekst,
-            traadId: props.traad.traadId,
-            traadType: state.traadType,
-            temagruppe: props.traad.temagruppe,
-            behandlingsId: opprettHenvendelse.henvendelse.behandlingsId,
-            oppgaveId: oppgaveId,
-            avsluttet: state.avsluttet
-        };
-        if (FortsettDialogValidator.erGyldigSamtalereferat(state)) {
-            setDialogStatus({ type: DialogPanelStatus.POSTING });
-            const request: SendMeldingRequest = {
-                ...commonPayload,
-                erOppgaveTilknyttetAnsatt: true
-            };
-            const kvitteringsData: KvitteringsData = {
-                fritekst: request.fritekst,
-                traad: props.traad
-            };
-            post(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Svar')
-                .then(() => {
-                    callback();
-                    setDialogStatus({ type: DialogPanelStatus.SVAR_SENDT, kvitteringsData: kvitteringsData });
-                })
-                .catch(() => {
-                    setDialogStatus({ type: DialogPanelStatus.ERROR });
-                });
-        } else if (FortsettDialogValidator.erGyldigSamtale(state)) {
-            const tradErJournalfort = erJournalfort(props.traad);
-            const erOksos = props.traad.meldinger[0].temagruppe === Temagruppe.ØkonomiskSosial;
-            if (!state.sak && !tradErJournalfort && !erOksos) {
-                const error = Error(
-                    'For å opprette spørsmål må meldingen være journalført, sak må være valgt, eller være på temagruppen OKSOS'
-                );
-                console.error(error);
-                loggError(error);
-                updateState({ errors: [error], visFeilmeldinger: true });
-                return;
-            }
-            setDialogStatus({ type: DialogPanelStatus.POSTING });
-            const request: SendMeldingRequest = {
-                ...commonPayload,
-                erOppgaveTilknyttetAnsatt: state.avsluttet ? false : erOppgaveTilknyttetAnsatt,
-                sak: state.sak ? state.sak : undefined
-            };
-            const kvitteringsData: KvitteringsData = {
-                fritekst: request.fritekst,
-                traad: props.traad
-            };
-            post(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Svar-Med-Spørsmål')
-                .then(() => {
-                    callback();
-                    queryClient.invalidateQueries(journalsakResource.queryKey(fnr));
-                    setDialogStatus({ type: DialogPanelStatus.SVAR_SENDT, kvitteringsData: kvitteringsData });
-                })
-                .catch(() => {
-                    setDialogStatus({ type: DialogPanelStatus.ERROR });
-                });
-        } else {
-            const error = Error('Det skjedde en feil ved sending av melding');
-            updateState({ errors: [error], visFeilmeldinger: true });
-        }
-    };
-
-    function traadTittel(traadType?: TraadType) {
-        switch (traadType) {
-            case TraadType.CHAT:
-                return 'Fortsett chat';
-            case TraadType.MELDINGSKJEDE:
-                return 'Fortsett samtale';
-            case TraadType.SAMTALEREFERAT:
-                return 'Påfølgende referat';
-            default:
-                return '';
-        }
-    }
-
-    return (
-        <StyledArticle aria-labelledby={tittelId.current}>
-            <ReflowBoundry>
-                <Undertittel id={tittelId.current}>{traadTittel(props.traad.traadType)}</Undertittel>
-                <NyFortsettDialog
-                    handleAvbryt={handleAvbryt}
-                    state={state}
-                    updateState={updateState}
-                    handleSubmit={handleSubmit}
-                    traad={props.traad}
-                    key={props.traad.traadId}
-                    fortsettDialogPanelState={dialogStatus}
-                    erTilknyttetOppgave={!!oppgaveId}
-                    erSTOOppgave={erSTOOppgave}
-                />
-            </ReflowBoundry>
-        </StyledArticle>
-    );
-}
-
-export default NyFortsettDialogContainer;
diff --git a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogKvittering.tsx b/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogKvittering.tsx
deleted file mode 100644
index 3de49e0ca..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogKvittering.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from 'react';
-import { DialogpanelKvittering } from '../nyFellesStyling';
-import { useDispatch } from 'react-redux';
-import { setIngenValgtTraadDialogpanel } from '../../../../redux/oppgave/actions';
-import { KvitteringsData } from './NyFortsettDialogTypes';
-import { SendNyMeldingStatus } from '../sendMelding/SendNyMeldingTypes';
-
-export function SvarSendtKvittering(props: { kvitteringsData: KvitteringsData }) {
-    const dispatch = useDispatch();
-
-    return (
-        <DialogpanelKvittering
-            tittel="Svar ble sendt"
-            fritekst={props.kvitteringsData.fritekst}
-            traad={props.kvitteringsData.traad}
-            lukk={() => {
-                dispatch(setIngenValgtTraadDialogpanel());
-            }}
-            meldingstatus={SendNyMeldingStatus.SVAR_SENDT}
-        />
-    );
-}
diff --git a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogTypes.ts b/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogTypes.ts
deleted file mode 100644
index ac965ee84..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogTypes.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Traad, TraadType } from '../../../../models/meldinger/meldinger';
-import { OppgavelisteValg } from '../sendMelding/SendNyMelding';
-import { JournalforingsSak } from '../../infotabs/meldinger/traadvisning/verktoylinje/journalforing/JournalforingPanel';
-import { Temagruppe } from '../../../../models/temagrupper';
-
-export enum DialogPanelStatus {
-    UNDER_ARBEID,
-    POSTING,
-    ERROR,
-    SVAR_SENDT
-}
-
-export type KvitteringsData = {
-    fritekst: string;
-    temagruppe?: Temagruppe;
-    traad: Traad;
-};
-
-interface DialogStatusInterface {
-    type: DialogPanelStatus;
-}
-
-interface UnderArbeid extends DialogStatusInterface {
-    type: DialogPanelStatus.UNDER_ARBEID | DialogPanelStatus.POSTING | DialogPanelStatus.ERROR;
-}
-
-interface SvarSendtSuccess extends DialogStatusInterface {
-    type: DialogPanelStatus.SVAR_SENDT;
-    kvitteringsData: KvitteringsData;
-}
-
-export type FortsettDialogPanelState = UnderArbeid | SvarSendtSuccess;
-
-export interface FortsettDialogState {
-    tekst: string;
-    traadType: TraadType;
-    temagruppe?: Temagruppe;
-    oppgaveListe: OppgavelisteValg;
-    sak?: JournalforingsSak;
-    visFeilmeldinger: boolean;
-    errors?: Error[];
-    avsluttet?: boolean;
-}
diff --git a/src/app/personside/dialogpanel/fortsettDialog/VelgDialogType.tsx b/src/app/personside/dialogpanel/fortsettDialog/VelgDialogType.tsx
deleted file mode 100644
index 50e2726b6..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/VelgDialogType.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import * as React from 'react';
-import { Meldingstype } from '../../../../models/meldinger/meldinger';
-import { FortsettDialogType } from './FortsettDialogContainer';
-import { Radio } from 'nav-frontend-skjema';
-import { VelgDialogtypeStyle } from '../fellesStyling';
-import { FortsettDialogState } from './FortsettDialogTypes';
-import { useJustOnceEffect } from '../../../../utils/customHooks';
-
-interface Props {
-    formState: FortsettDialogState;
-    updateDialogType: (dialogType: FortsettDialogType) => void;
-    erTilknyttetOppgave: boolean;
-    erSTOOppgave: boolean;
-    erOksosTraad: boolean;
-    erSamtalereferat: boolean;
-}
-
-function lagRadio(label: string, type: FortsettDialogType, props: Props): React.ReactNode {
-    return (
-        <Radio
-            label={label}
-            name="dialogtype"
-            onChange={() => props.updateDialogType(type)}
-            checked={props.formState.dialogType === type}
-        />
-    );
-}
-
-function VelgDialogType(props: Props) {
-    useJustOnceEffect(
-        (done) => {
-            const type = props.erSamtalereferat ? Meldingstype.SAMTALEREFERAT_TELEFON : Meldingstype.SVAR_SKRIFTLIG;
-            props.updateDialogType(type);
-            done();
-        },
-        [props.erSamtalereferat]
-    );
-
-    if (props.erSamtalereferat) {
-        return (
-            <VelgDialogtypeStyle>
-                {lagRadio('Referat telefon', Meldingstype.SAMTALEREFERAT_TELEFON, props)}
-                {lagRadio('Referat oppmøte', Meldingstype.SAMTALEREFERAT_OPPMOTE, props)}
-            </VelgDialogtypeStyle>
-        );
-    } else {
-        return (
-            <VelgDialogtypeStyle>
-                {lagRadio('Svar', Meldingstype.SVAR_SKRIFTLIG, props)}
-                {lagRadio('Spørsmål', Meldingstype.SPORSMAL_MODIA_UTGAAENDE, props)}
-            </VelgDialogtypeStyle>
-        );
-    }
-}
-
-export default VelgDialogType;
diff --git a/src/app/personside/dialogpanel/fortsettDialog/nyValidatorer.ts b/src/app/personside/dialogpanel/fortsettDialog/nyValidatorer.ts
deleted file mode 100644
index 75e9860a8..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/nyValidatorer.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { tekstMaksLengde } from '../sendMelding/SendNyMelding';
-import { TraadType } from '../../../../models/meldinger/meldinger';
-import { FortsettDialogState } from './NyFortsettDialogTypes';
-
-export class FortsettDialogValidator {
-    public static tekst(state: FortsettDialogState) {
-        return state.tekst.length <= tekstMaksLengde && state.tekst.length > 0;
-    }
-    public static sak(state: FortsettDialogState) {
-        return state.sak !== undefined;
-    }
-    public static tema(state: FortsettDialogState) {
-        return state.temagruppe !== undefined;
-    }
-    public static erGyldigSamtale(state: FortsettDialogState) {
-        return state.traadType !== TraadType.SAMTALEREFERAT && this.tekst(state);
-    }
-    public static erGyldigSamtalereferat(state: FortsettDialogState) {
-        return state.traadType === TraadType.SAMTALEREFERAT && this.tekst(state);
-    }
-}
diff --git a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/EnkeltMelding.tsx b/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/EnkeltMelding.tsx
index 84807498a..1e73ddb8c 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/EnkeltMelding.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/EnkeltMelding.tsx
@@ -4,9 +4,9 @@ import styled from 'styled-components/macro';
 import Tekstomrade, { defaultRules } from 'nav-frontend-tekstomrade';
 import { rule as sladdRule } from '../../../../../utils/sladdrule';
 import { Element, Undertekst } from 'nav-frontend-typografi';
-import { Melding } from '../../../../../models/meldinger/meldinger';
+import { Melding, Traad } from '../../../../../models/meldinger/meldinger';
 import { formatterDatoTidMedMaanedsnavn } from '../../../../../utils/date-utils';
-import { meldingstittel } from '../../../infotabs/meldinger/utils/meldingerUtils';
+import { traadstittel } from '../../../infotabs/meldinger/utils/meldingerUtils';
 import theme from '../../../../../styles/personOversiktTheme';
 import { Avsender } from '../../../infotabs/meldinger/traadvisning/Enkeltmelding';
 import { EkspanderbartpanelBase } from 'nav-frontend-ekspanderbartpanel';
@@ -30,6 +30,7 @@ const StyledEkspanderbartpanelBase = styled(EkspanderbartpanelBase)`
 `;
 
 interface Props {
+    traad: Traad;
     melding: Melding;
     erEnkeltstaende: boolean;
     defaultApen: boolean;
@@ -43,7 +44,7 @@ function EnkeltMelding(props: Props) {
         <HeaderStyle>
             <span className="sr-only">Melding {props.meldingsNummer}</span>
             <span className="sr-only">{apen ? 'Åpen' : 'Lukket'}</span>
-            <Element tag="h4">{meldingstittel(props.melding)}</Element>
+            <Element tag="h4">{traadstittel(props.traad)}</Element>
             <Undertekst>{formatterDatoTidMedMaanedsnavn(props.melding.opprettetDato)}</Undertekst>
             <Avsender melding={props.melding} />
         </HeaderStyle>
diff --git a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/NyEnkeltMelding.tsx b/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/NyEnkeltMelding.tsx
deleted file mode 100644
index 1bef44f74..000000000
--- a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/NyEnkeltMelding.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import * as React from 'react';
-import { useState } from 'react';
-import styled from 'styled-components/macro';
-import Tekstomrade, { defaultRules } from 'nav-frontend-tekstomrade';
-import { rule as sladdRule } from '../../../../../utils/sladdrule';
-import { Element, Undertekst } from 'nav-frontend-typografi';
-import { Melding, Traad } from '../../../../../models/meldinger/meldinger';
-import { formatterDatoTidMedMaanedsnavn } from '../../../../../utils/date-utils';
-import { traadstittel } from '../../../infotabs/meldinger/utils/meldingerUtils';
-import theme from '../../../../../styles/personOversiktTheme';
-import { Avsender } from '../../../infotabs/meldinger/traadvisning/Enkeltmelding';
-import { EkspanderbartpanelBase } from 'nav-frontend-ekspanderbartpanel';
-
-const HeaderStyle = styled.div`
-    width: 100%;
-    padding-right: 1rem;
-`;
-
-const StyledTekstomrade = styled(Tekstomrade)`
-    padding: 1.5rem 1rem 1rem;
-    overflow-wrap: break-word;
-    padding-top: 0;
-`;
-
-const StyledEkspanderbartpanelBase = styled(EkspanderbartpanelBase)`
-    ${theme.resetEkspanderbartPanelStyling};
-    .ekspanderbartPanel__hode:focus {
-        ${theme.focusInset};
-    }
-`;
-
-interface Props {
-    traad: Traad;
-    melding: Melding;
-    erEnkeltstaende: boolean;
-    defaultApen: boolean;
-    meldingsNummer: number;
-}
-
-function NyEnkeltMelding(props: Props) {
-    const [apen, setApen] = useState(props.defaultApen);
-
-    const header = (
-        <HeaderStyle>
-            <span className="sr-only">Melding {props.meldingsNummer}</span>
-            <span className="sr-only">{apen ? 'Åpen' : 'Lukket'}</span>
-            <Element tag="h4">{traadstittel(props.traad)}</Element>
-            <Undertekst>{formatterDatoTidMedMaanedsnavn(props.melding.opprettetDato)}</Undertekst>
-            <Avsender melding={props.melding} />
-        </HeaderStyle>
-    );
-
-    return (
-        <StyledEkspanderbartpanelBase tittel={header} apen={apen} onClick={() => setApen(!apen)} border={false}>
-            <StyledTekstomrade rules={[sladdRule, ...defaultRules]}>{props.melding.fritekst}</StyledTekstomrade>
-        </StyledEkspanderbartpanelBase>
-    );
-}
-
-export default NyEnkeltMelding;
diff --git a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/TidligereMeldinger.tsx b/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/TidligereMeldinger.tsx
index 2a1d050ce..9705ad3f8 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/TidligereMeldinger.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/TidligereMeldinger.tsx
@@ -7,10 +7,6 @@ import ErrorBoundary from '../../../../../components/ErrorBoundary';
 import Ekspanderbartpanel from 'nav-frontend-ekspanderbartpanel';
 import { Undertittel } from 'nav-frontend-typografi';
 import Panel from 'nav-frontend-paneler';
-import IfFeatureToggleOn from '../../../../../components/featureToggle/IfFeatureToggleOn';
-import IfFeatureToggleOff from '../../../../../components/featureToggle/IfFeatureToggleOff';
-import { FeatureToggles } from '../../../../../components/featureToggle/toggleIDs';
-import NyEnkeltMelding from './NyEnkeltMelding';
 
 interface Props {
     traad: Traad;
@@ -52,23 +48,13 @@ function Traadpanel(props: { traad: Traad; tittel: string; defaultApen: boolean
 
         return (
             <StyledLi key={melding.id}>
-                <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                    <NyEnkeltMelding
-                        traad={props.traad}
-                        melding={melding}
-                        erEnkeltstaende={props.traad.meldinger.length === 1}
-                        defaultApen={props.defaultApen && !flereMeldinger}
-                        meldingsNummer={meldingnummer}
-                    />
-                </IfFeatureToggleOn>
-                <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                    <EnkeltMelding
-                        melding={melding}
-                        erEnkeltstaende={props.traad.meldinger.length === 1}
-                        defaultApen={props.defaultApen && !flereMeldinger}
-                        meldingsNummer={meldingnummer}
-                    />
-                </IfFeatureToggleOff>
+                <EnkeltMelding
+                    traad={props.traad}
+                    melding={melding}
+                    erEnkeltstaende={props.traad.meldinger.length === 1}
+                    defaultApen={props.defaultApen && !flereMeldinger}
+                    meldingsNummer={meldingnummer}
+                />
             </StyledLi>
         );
     });
diff --git a/src/app/personside/dialogpanel/fortsettDialog/validatorer.ts b/src/app/personside/dialogpanel/fortsettDialog/validatorer.ts
index 4e1737516..ccde30c68 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/validatorer.ts
+++ b/src/app/personside/dialogpanel/fortsettDialog/validatorer.ts
@@ -1,8 +1,6 @@
 import { tekstMaksLengde } from '../sendMelding/SendNyMelding';
-import { Meldingstype, Traad } from '../../../../models/meldinger/meldinger';
-import { erJournalfort } from '../../infotabs/meldinger/utils/meldingerUtils';
+import { TraadType } from '../../../../models/meldinger/meldinger';
 import { FortsettDialogState } from './FortsettDialogTypes';
-import { Temagruppe } from '../../../../models/temagrupper';
 
 export class FortsettDialogValidator {
     public static tekst(state: FortsettDialogState) {
@@ -14,25 +12,10 @@ export class FortsettDialogValidator {
     public static tema(state: FortsettDialogState) {
         return state.temagruppe !== undefined;
     }
-    public static erGyldigSvarSkriftlig(state: FortsettDialogState) {
-        return state.dialogType === Meldingstype.SVAR_SKRIFTLIG && this.tekst(state);
+    public static erGyldigSamtale(state: FortsettDialogState) {
+        return state.traadType !== TraadType.SAMTALEREFERAT && this.tekst(state);
     }
-    public static erGyldigSporsmaalSkriftlig(state: FortsettDialogState, traad: Traad) {
-        const traadTemagruppe = traad.meldinger[0].temagruppe;
-        if (traadTemagruppe === Temagruppe.ØkonomiskSosial) {
-            return state.dialogType === Meldingstype.SPORSMAL_MODIA_UTGAAENDE && this.tekst(state);
-        }
-        return (
-            state.dialogType === Meldingstype.SPORSMAL_MODIA_UTGAAENDE &&
-            this.tekst(state) &&
-            (this.sak(state) || erJournalfort(traad))
-        );
-    }
-
     public static erGyldigSamtalereferat(state: FortsettDialogState) {
-        return (
-            [Meldingstype.SAMTALEREFERAT_TELEFON, Meldingstype.SAMTALEREFERAT_OPPMOTE].includes(state.dialogType) &&
-            this.tekst(state)
-        );
+        return state.traadType === TraadType.SAMTALEREFERAT && this.tekst(state);
     }
 }
diff --git a/src/app/personside/dialogpanel/sendMelding/NySendNyMelding.tsx b/src/app/personside/dialogpanel/sendMelding/NySendNyMelding.tsx
deleted file mode 100644
index b3bbfa657..000000000
--- a/src/app/personside/dialogpanel/sendMelding/NySendNyMelding.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import * as React from 'react';
-import { FormEvent, useRef } from 'react';
-import { TraadType } from '../../../../models/meldinger/meldinger';
-import { UnmountClosed } from 'react-collapse';
-import KnappBase from 'nav-frontend-knapper';
-import styled from 'styled-components/macro';
-import Temavelger from '../component/Temavelger';
-import KnappMedBekreftPopup from '../../../../components/KnappMedBekreftPopup';
-import { JournalforingsSak } from '../../infotabs/meldinger/traadvisning/verktoylinje/journalforing/JournalforingPanel';
-import DialogpanelVelgSak from './DialogpanelVelgSak';
-import { capitalizeName } from '../../../../utils/string-utils';
-import AlertStripeInfo from 'nav-frontend-alertstriper/lib/info-alertstripe';
-import { NyMeldingValidator } from './nyValidatorer';
-import TekstFelt from './TekstFelt';
-import { Undertittel } from 'nav-frontend-typografi';
-import Oppgaveliste from './Oppgaveliste';
-import { DialogpanelFeilmelding, FormStyle } from '../fellesStyling';
-import theme from '../../../../styles/personOversiktTheme';
-import { SendNyMeldingPanelState, SendNyMeldingStatus } from './SendNyMeldingTypes';
-import { Temagruppe, TemaSamtalereferat } from '../../../../models/temagrupper';
-import { guid } from 'nav-frontend-js-utils';
-import ReflowBoundry from '../ReflowBoundry';
-import { Checkbox, SkjemaelementFeilmelding } from 'nav-frontend-skjema';
-import persondataResource from '../../../../rest/resources/persondataResource';
-import NyVelgDialogType from './NyVelgDialogType';
-import Panel from 'nav-frontend-paneler';
-
-export enum OppgavelisteValg {
-    MinListe = 'MinListe',
-    EnhetensListe = 'Enhetensliste'
-}
-
-export interface NySendNyMeldingState {
-    tekst: string;
-    traadType: TraadType;
-    tema?: Temagruppe;
-    sak?: JournalforingsSak;
-    oppgaveListe: OppgavelisteValg;
-    visFeilmeldinger: boolean;
-    avsluttet: boolean;
-}
-
-const StyledArticle = styled.article`
-    padding: 1rem ${theme.margin.layout};
-`;
-
-const KnappWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    > * {
-        margin-bottom: 0.7rem;
-    }
-`;
-
-const StyledAlertStripeInfo = styled(AlertStripeInfo)`
-    margin-top: 1rem;
-`;
-
-const StyledCheckbox = styled(Checkbox)`
-    margin-top: 1rem;
-`;
-
-const StyledUndertittel = styled(Undertittel)`
-    margin-bottom: 1rem !important;
-`;
-
-export const tekstMaksLengde = 10000;
-
-interface Props {
-    handleSubmit: (event: FormEvent) => void;
-    handleAvbryt: () => void;
-    state: NySendNyMeldingState;
-    updateState: (change: Partial<NySendNyMeldingState>) => void;
-    formErEndret: boolean;
-    sendNyMeldingPanelState: SendNyMeldingPanelState;
-}
-
-function Feilmelding(props: { sendNyMeldingPanelState: SendNyMeldingStatus }) {
-    if (props.sendNyMeldingPanelState === SendNyMeldingStatus.ERROR) {
-        return <DialogpanelFeilmelding />;
-    }
-    return null;
-}
-
-function NySendNyMelding(props: Props) {
-    const updateState = props.updateState;
-    const state = props.state;
-    const personResponse = persondataResource.useFetch();
-    const tittelId = useRef(guid());
-
-    const navn = personResponse.data
-        ? capitalizeName(personResponse.data.person.navn.firstOrNull()?.fornavn || '')
-        : 'bruker';
-
-    const erReferat = NyMeldingValidator.erReferat(state);
-    const erSamtale = NyMeldingValidator.erSamtale(state);
-    const visFeilmelding = !NyMeldingValidator.sak(state) && state.visFeilmeldinger;
-    return (
-        <StyledArticle aria-labelledby={tittelId.current}>
-            <ReflowBoundry>
-                <StyledUndertittel id={tittelId.current}>Send ny melding</StyledUndertittel>
-                <FormStyle onSubmit={props.handleSubmit}>
-                    <TekstFelt
-                        tekst={state.tekst}
-                        navn={navn}
-                        tekstMaksLengde={tekstMaksLengde}
-                        updateTekst={(tekst) => updateState({ tekst })}
-                        feilmelding={
-                            !NyMeldingValidator.tekst(state) && state.visFeilmeldinger
-                                ? `Du må skrive en tekst på mellom 1 og ${tekstMaksLengde} tegn`
-                                : undefined
-                        }
-                    />
-                    <NyVelgDialogType
-                        formState={state}
-                        updateTraadType={(traadType, avsluttet) => updateState({ traadType, avsluttet })}
-                    />
-                    <div>
-                        <UnmountClosed isOpened={erReferat}>
-                            {/* hasNestedCollapse={true} for å unngå rar animasjon på feilmelding*/}
-                            <Temavelger
-                                setTema={(tema) => updateState({ tema: tema })}
-                                valgtTema={state.tema}
-                                visFeilmelding={!NyMeldingValidator.tema(state) && state.visFeilmeldinger}
-                                temavalg={TemaSamtalereferat}
-                            />
-                            <StyledAlertStripeInfo>Gir ikke varsel til bruker</StyledAlertStripeInfo>
-                        </UnmountClosed>
-                        <UnmountClosed isOpened={erSamtale}>
-                            <Panel>
-                                <DialogpanelVelgSak
-                                    setValgtSak={(sak) => updateState({ sak })}
-                                    valgtSak={state.sak}
-                                    eksisterendeSaker={[]}
-                                />
-                                {visFeilmelding ? (
-                                    <SkjemaelementFeilmelding>Du må velge sak </SkjemaelementFeilmelding>
-                                ) : undefined}
-                                {!state.avsluttet && (
-                                    <>
-                                        <Oppgaveliste
-                                            oppgaveliste={state.oppgaveListe}
-                                            setOppgaveliste={(oppgaveliste) =>
-                                                updateState({ oppgaveListe: oppgaveliste })
-                                            }
-                                        />
-                                        <StyledAlertStripeInfo>Gir varsel, bruker må svare</StyledAlertStripeInfo>
-                                    </>
-                                )}
-                                {state.avsluttet && (
-                                    <StyledAlertStripeInfo>
-                                        Bruker kan ikke skrive mer i denne samtalen
-                                    </StyledAlertStripeInfo>
-                                )}
-                                {!state.avsluttet && (
-                                    <StyledCheckbox
-                                        label={'Avslutt samtale etter sending'}
-                                        checked={state.avsluttet}
-                                        onChange={() => updateState({ avsluttet: !state.avsluttet })}
-                                    />
-                                )}
-                            </Panel>
-                        </UnmountClosed>
-                    </div>
-                    <Feilmelding sendNyMeldingPanelState={props.sendNyMeldingPanelState.type} />
-                    <KnappWrapper>
-                        <KnappBase
-                            type="hoved"
-                            spinner={props.sendNyMeldingPanelState.type === SendNyMeldingStatus.POSTING}
-                            htmlType="submit"
-                        >
-                            Del med {navn}
-                        </KnappBase>
-                        {props.formErEndret && (
-                            <KnappMedBekreftPopup
-                                htmlType="reset"
-                                type="flat"
-                                onBekreft={props.handleAvbryt}
-                                bekreftKnappTekst={'Ja, avbryt'}
-                                popUpTekst="Er du sikker på at du vil avbryte? Du mister da meldinger du har påbegynt."
-                            >
-                                Avbryt
-                            </KnappMedBekreftPopup>
-                        )}
-                    </KnappWrapper>
-                </FormStyle>
-            </ReflowBoundry>
-        </StyledArticle>
-    );
-}
-
-export default NySendNyMelding;
diff --git a/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingContainer.tsx b/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingContainer.tsx
deleted file mode 100644
index f043ea92c..000000000
--- a/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingContainer.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import * as React from 'react';
-import { FormEvent, useCallback, useMemo, useState } from 'react';
-import { OppgavelisteValg, SendNyMeldingState } from './SendNyMelding';
-import { NyMeldingValidator } from './nyValidatorer';
-import { SendMeldingRequest, SendReferatRequest, Traad, TraadType } from '../../../../models/meldinger/meldinger';
-import { useFodselsnummer } from '../../../../utils/customHooks';
-import { MeldingSendtFeilet, ReferatSendtKvittering, SamtaleSendtKvittering } from './NySendNyMeldingKvittering';
-import { apiBaseUri } from '../../../../api/config';
-import { post } from '../../../../api/api';
-import { KvitteringNyMelding, SendNyMeldingPanelState, SendNyMeldingStatus } from './SendNyMeldingTypes';
-import useDraft, { Draft } from '../use-draft';
-import { feilMeldinger } from './FeilMeldinger';
-import dialogResource from '../../../../rest/resources/dialogResource';
-import { useValgtenhet } from '../../../../context/valgtenhet-state';
-import { useQueryClient } from '@tanstack/react-query';
-import journalsakResource from '../../../../rest/resources/journalsakResource';
-import NySendNyMelding, { NySendNyMeldingState } from './NySendNyMelding';
-
-interface Props {
-    defaultOppgaveDestinasjon: OppgavelisteValg;
-}
-
-function NySendNyMeldingContainer(props: Props) {
-    const queryClient = useQueryClient();
-    const initialState: NySendNyMeldingState = useMemo(
-        () => ({
-            tekst: '',
-            traadType: TraadType.SAMTALEREFERAT,
-            tema: undefined,
-            sak: undefined,
-            avsluttet: false,
-            oppgaveListe: props.defaultOppgaveDestinasjon,
-            visFeilmeldinger: false
-        }),
-        [props.defaultOppgaveDestinasjon]
-    );
-    const fnr = useFodselsnummer();
-
-    const valgtEnhet = useValgtenhet().enhetId;
-    const [state, setState] = useState<NySendNyMeldingState>(initialState);
-    const draftLoader = useCallback(
-        (draft: Draft) => setState((current) => ({ ...current, tekst: draft.content })),
-        [setState]
-    );
-    const draftContext = useMemo(() => ({ fnr }), [fnr]);
-    const { update: updateDraft, remove: removeDraft } = useDraft(draftContext, draftLoader);
-    const updateState = useCallback(
-        (change: Partial<SendNyMeldingState>) =>
-            setState((currentState) => {
-                if (change.tekst !== undefined) {
-                    updateDraft(change.tekst);
-                }
-                return { ...currentState, visFeilmeldinger: false, ...change };
-            }),
-        [setState, updateDraft]
-    );
-
-    const [sendNyMeldingStatus, setSendNyMeldingStatus] = useState<SendNyMeldingPanelState>({
-        type: SendNyMeldingStatus.UNDER_ARBEID
-    });
-    const lukkSendtKvittering = () => {
-        setSendNyMeldingStatus({ type: SendNyMeldingStatus.UNDER_ARBEID });
-        setState(initialState);
-    };
-
-    if (sendNyMeldingStatus.type === SendNyMeldingStatus.REFERAT_SENDT) {
-        return (
-            <ReferatSendtKvittering
-                kvitteringNyMelding={sendNyMeldingStatus.kvitteringNyMelding}
-                lukk={lukkSendtKvittering}
-            />
-        );
-    }
-
-    if (sendNyMeldingStatus.type === SendNyMeldingStatus.SAMTALE_SENDT) {
-        return (
-            <SamtaleSendtKvittering
-                kvitteringNyMelding={sendNyMeldingStatus.kvitteringNyMelding}
-                lukk={lukkSendtKvittering}
-            />
-        );
-    }
-
-    if (sendNyMeldingStatus.type === SendNyMeldingStatus.ERROR) {
-        return <MeldingSendtFeilet fritekst={sendNyMeldingStatus.fritekst} lukk={lukkSendtKvittering} />;
-    }
-
-    const handleAvbryt = () => {
-        removeDraft();
-        setState(initialState);
-        setSendNyMeldingStatus({ type: SendNyMeldingStatus.UNDER_ARBEID });
-    };
-
-    const handleFeilMelding = (error: Error) => {
-        const feilType = JSON.parse(error.toString()).type;
-        return feilMeldinger[feilType];
-    };
-
-    const handleSubmit = (event: FormEvent) => {
-        event.preventDefault();
-        if (sendNyMeldingStatus.type === SendNyMeldingStatus.POSTING) {
-            return;
-        }
-        const callback = () => {
-            removeDraft();
-            updateState(initialState);
-            queryClient.invalidateQueries(dialogResource.queryKey(fnr, valgtEnhet));
-        };
-
-        const commonPayload = {
-            traadType: state.traadType,
-            enhet: valgtEnhet,
-            fritekst: state.tekst
-        };
-
-        if (NyMeldingValidator.erGyldigReferat(state) && state.tema) {
-            setSendNyMeldingStatus({ type: SendNyMeldingStatus.POSTING });
-            const request: SendMeldingRequest = {
-                ...commonPayload,
-                temagruppe: state.tema
-            };
-
-            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Referat')
-                .then((traad) => {
-                    const kvitteringNyMelding: KvitteringNyMelding = {
-                        fritekst: request.fritekst,
-                        traad: traad
-                    };
-                    callback();
-                    setSendNyMeldingStatus({
-                        type: SendNyMeldingStatus.REFERAT_SENDT,
-                        request: {} as SendReferatRequest,
-                        kvitteringNyMelding
-                    });
-                })
-                .catch((error) => {
-                    console.error('Send-Referat feilet', error);
-                    setSendNyMeldingStatus({ type: SendNyMeldingStatus.ERROR, fritekst: request.fritekst });
-                });
-        } else if (NyMeldingValidator.erGyldigSamtale(state) && state.sak) {
-            setSendNyMeldingStatus({ type: SendNyMeldingStatus.POSTING });
-            const request: SendMeldingRequest = {
-                ...commonPayload,
-                sak: state.sak,
-                avsluttet: state.avsluttet,
-                erOppgaveTilknyttetAnsatt: state.oppgaveListe === OppgavelisteValg.MinListe
-            };
-
-            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Sporsmal')
-                .then((traad) => {
-                    const kvitteringNyMelding: KvitteringNyMelding = {
-                        fritekst: request.fritekst,
-                        traad: traad
-                    };
-                    queryClient.invalidateQueries(journalsakResource.queryKey(fnr));
-                    callback();
-                    setSendNyMeldingStatus({ type: SendNyMeldingStatus.SAMTALE_SENDT, kvitteringNyMelding });
-                })
-                .catch((error) => {
-                    callback();
-                    console.error('Send-Sporsmal feilet', error);
-                    setSendNyMeldingStatus({
-                        type: SendNyMeldingStatus.ERROR,
-                        fritekst: handleFeilMelding(error)
-                    });
-                    updateState({ visFeilmeldinger: true });
-                });
-        } else {
-            updateState({ visFeilmeldinger: true });
-        }
-    };
-
-    return (
-        <NySendNyMelding
-            updateState={updateState}
-            state={state}
-            handleSubmit={handleSubmit}
-            handleAvbryt={handleAvbryt}
-            formErEndret={state !== initialState}
-            sendNyMeldingPanelState={sendNyMeldingStatus}
-        />
-    );
-}
-
-export default NySendNyMeldingContainer;
diff --git a/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingKvittering.tsx b/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingKvittering.tsx
deleted file mode 100644
index 9bcb0007b..000000000
--- a/src/app/personside/dialogpanel/sendMelding/NySendNyMeldingKvittering.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as React from 'react';
-import { DialogpanelKvittering } from '../nyFellesStyling';
-import { KvitteringNyMelding, SendNyMeldingStatus } from './SendNyMeldingTypes';
-
-export function ReferatSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
-    return (
-        <DialogpanelKvittering
-            tittel={'Referat sendt til bruker'}
-            fritekst={props.kvitteringNyMelding.fritekst}
-            traad={props.kvitteringNyMelding.traad}
-            lukk={props.lukk}
-            meldingstatus={SendNyMeldingStatus.REFERAT_SENDT}
-        />
-    );
-}
-
-export function SamtaleSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
-    return (
-        <DialogpanelKvittering
-            tittel="Samtale ble sendt"
-            fritekst={props.kvitteringNyMelding.fritekst}
-            traad={props.kvitteringNyMelding.traad}
-            lukk={props.lukk}
-            meldingstatus={SendNyMeldingStatus.SPORSMAL_SENDT}
-        />
-    );
-}
-
-export function MeldingSendtFeilet(props: { fritekst: string; lukk: () => void }) {
-    return (
-        <DialogpanelKvittering
-            tittel="Melding ble sendt, men feil i baksystem"
-            fritekst={props.fritekst}
-            lukk={props.lukk}
-            meldingstatus={SendNyMeldingStatus.ERROR}
-        />
-    );
-}
diff --git a/src/app/personside/dialogpanel/sendMelding/NyVelgDialogType.tsx b/src/app/personside/dialogpanel/sendMelding/NyVelgDialogType.tsx
deleted file mode 100644
index d8ae84fe8..000000000
--- a/src/app/personside/dialogpanel/sendMelding/NyVelgDialogType.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react';
-import { TraadType } from '../../../../models/meldinger/meldinger';
-import { Radio } from 'nav-frontend-skjema';
-import { VelgDialogtypeStyle } from '../fellesStyling';
-import { NySendNyMeldingState } from './NySendNyMelding';
-
-interface Props {
-    formState: NySendNyMeldingState;
-    updateTraadType: (traadType: TraadType, avsluttet: boolean) => void;
-}
-
-function NyVelgDialogType(props: Props) {
-    return (
-        <VelgDialogtypeStyle>
-            <Radio
-                label="Referat"
-                onChange={() => props.updateTraadType(TraadType.SAMTALEREFERAT, false)}
-                checked={props.formState.traadType === TraadType.SAMTALEREFERAT}
-                name="dialogtype"
-            />
-            <Radio
-                label="Samtale"
-                onChange={() => props.updateTraadType(TraadType.MELDINGSKJEDE, false)}
-                checked={props.formState.traadType !== TraadType.SAMTALEREFERAT && !props.formState.avsluttet}
-                name="dialogtype"
-            />
-            <Radio
-                label="Infomelding"
-                onChange={() => props.updateTraadType(TraadType.MELDINGSKJEDE, true)}
-                checked={props.formState.traadType !== TraadType.SAMTALEREFERAT && props.formState.avsluttet}
-                name="dialogtype"
-            />
-        </VelgDialogtypeStyle>
-    );
-}
-
-export default NyVelgDialogType;
diff --git a/src/app/personside/dialogpanel/sendMelding/SendNyMelding.tsx b/src/app/personside/dialogpanel/sendMelding/SendNyMelding.tsx
index babed39e2..fc5be67b7 100644
--- a/src/app/personside/dialogpanel/sendMelding/SendNyMelding.tsx
+++ b/src/app/personside/dialogpanel/sendMelding/SendNyMelding.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { FormEvent, useRef } from 'react';
-import { Meldingstype } from '../../../../models/meldinger/meldinger';
+import { TraadType } from '../../../../models/meldinger/meldinger';
 import { UnmountClosed } from 'react-collapse';
 import KnappBase from 'nav-frontend-knapper';
 import styled from 'styled-components/macro';
@@ -10,9 +10,8 @@ import { JournalforingsSak } from '../../infotabs/meldinger/traadvisning/verktoy
 import DialogpanelVelgSak from './DialogpanelVelgSak';
 import { capitalizeName } from '../../../../utils/string-utils';
 import AlertStripeInfo from 'nav-frontend-alertstriper/lib/info-alertstripe';
-import { NyMeldingValidator } from './validatorer';
+import { MeldingValidator } from './validatorer';
 import TekstFelt from './TekstFelt';
-import VelgDialogType from './VelgDialogType';
 import { Undertittel } from 'nav-frontend-typografi';
 import Oppgaveliste from './Oppgaveliste';
 import { DialogpanelFeilmelding, FormStyle } from '../fellesStyling';
@@ -21,27 +20,24 @@ import { SendNyMeldingPanelState, SendNyMeldingStatus } from './SendNyMeldingTyp
 import { Temagruppe, TemaSamtalereferat } from '../../../../models/temagrupper';
 import { guid } from 'nav-frontend-js-utils';
 import ReflowBoundry from '../ReflowBoundry';
-import { SkjemaelementFeilmelding } from 'nav-frontend-skjema';
+import { Checkbox, SkjemaelementFeilmelding } from 'nav-frontend-skjema';
 import persondataResource from '../../../../rest/resources/persondataResource';
+import VelgDialogType from './VelgDialogType';
+import Panel from 'nav-frontend-paneler';
 
 export enum OppgavelisteValg {
     MinListe = 'MinListe',
     EnhetensListe = 'Enhetensliste'
 }
 
-export type SendNyMeldingDialogType =
-    | Meldingstype.SAMTALEREFERAT_TELEFON
-    | Meldingstype.SAMTALEREFERAT_OPPMOTE
-    | Meldingstype.SPORSMAL_MODIA_UTGAAENDE
-    | Meldingstype.INFOMELDING_MODIA_UTGAAENDE;
-
 export interface SendNyMeldingState {
     tekst: string;
-    dialogType: SendNyMeldingDialogType;
+    traadType: TraadType;
     tema?: Temagruppe;
     sak?: JournalforingsSak;
     oppgaveListe: OppgavelisteValg;
     visFeilmeldinger: boolean;
+    avsluttet: boolean;
 }
 
 const StyledArticle = styled.article`
@@ -60,8 +56,8 @@ const StyledAlertStripeInfo = styled(AlertStripeInfo)`
     margin-top: 1rem;
 `;
 
-const Margin = styled.div`
-    /* Pga React Collapse må vi slenge på noen div'er som tar seg av marginer for å unngå hopp i animasjon */
+const StyledCheckbox = styled(Checkbox)`
+    margin-top: 1rem;
 `;
 
 const StyledUndertittel = styled(Undertittel)`
@@ -85,6 +81,7 @@ function Feilmelding(props: { sendNyMeldingPanelState: SendNyMeldingStatus }) {
     }
     return null;
 }
+
 function SendNyMelding(props: Props) {
     const updateState = props.updateState;
     const state = props.state;
@@ -95,10 +92,9 @@ function SendNyMelding(props: Props) {
         ? capitalizeName(personResponse.data.person.navn.firstOrNull()?.fornavn || '')
         : 'bruker';
 
-    const erReferat = NyMeldingValidator.erReferat(state);
-    const erSporsmaal = NyMeldingValidator.erSporsmal(state);
-    const erInfomelding = NyMeldingValidator.erInfomelding(state);
-    const visFeilmelding = !NyMeldingValidator.sak(state) && state.visFeilmeldinger;
+    const erReferat = MeldingValidator.erReferat(state);
+    const erSamtale = MeldingValidator.erSamtale(state);
+    const visFeilmelding = !MeldingValidator.sak(state) && state.visFeilmeldinger;
     return (
         <StyledArticle aria-labelledby={tittelId.current}>
             <ReflowBoundry>
@@ -110,45 +106,62 @@ function SendNyMelding(props: Props) {
                         tekstMaksLengde={tekstMaksLengde}
                         updateTekst={(tekst) => updateState({ tekst })}
                         feilmelding={
-                            !NyMeldingValidator.tekst(state) && state.visFeilmeldinger
+                            !MeldingValidator.tekst(state) && state.visFeilmeldinger
                                 ? `Du må skrive en tekst på mellom 1 og ${tekstMaksLengde} tegn`
                                 : undefined
                         }
                     />
-                    <VelgDialogType formState={state} updateDialogType={(dialogType) => updateState({ dialogType })} />
-                    <Margin>
+                    <VelgDialogType
+                        formState={state}
+                        updateTraadType={(traadType, avsluttet) => updateState({ traadType, avsluttet })}
+                    />
+                    <div>
                         <UnmountClosed isOpened={erReferat}>
                             {/* hasNestedCollapse={true} for å unngå rar animasjon på feilmelding*/}
                             <Temavelger
                                 setTema={(tema) => updateState({ tema: tema })}
                                 valgtTema={state.tema}
-                                visFeilmelding={!NyMeldingValidator.tema(state) && state.visFeilmeldinger}
+                                visFeilmelding={!MeldingValidator.tema(state) && state.visFeilmeldinger}
                                 temavalg={TemaSamtalereferat}
                             />
                             <StyledAlertStripeInfo>Gir ikke varsel til bruker</StyledAlertStripeInfo>
                         </UnmountClosed>
-                        <UnmountClosed isOpened={erSporsmaal || erInfomelding}>
-                            <DialogpanelVelgSak
-                                setValgtSak={(sak) => updateState({ sak })}
-                                valgtSak={state.sak}
-                                eksisterendeSaker={[]}
-                            />
-                            {visFeilmelding ? (
-                                <SkjemaelementFeilmelding>Du må velge sak </SkjemaelementFeilmelding>
-                            ) : undefined}
-                            {erSporsmaal ? (
-                                <>
-                                    <Oppgaveliste
-                                        oppgaveliste={state.oppgaveListe}
-                                        setOppgaveliste={(oppgaveliste) => updateState({ oppgaveListe: oppgaveliste })}
+                        <UnmountClosed isOpened={erSamtale}>
+                            <Panel>
+                                <DialogpanelVelgSak
+                                    setValgtSak={(sak) => updateState({ sak })}
+                                    valgtSak={state.sak}
+                                    eksisterendeSaker={[]}
+                                />
+                                {visFeilmelding ? (
+                                    <SkjemaelementFeilmelding>Du må velge sak </SkjemaelementFeilmelding>
+                                ) : undefined}
+                                {!state.avsluttet && (
+                                    <>
+                                        <Oppgaveliste
+                                            oppgaveliste={state.oppgaveListe}
+                                            setOppgaveliste={(oppgaveliste) =>
+                                                updateState({ oppgaveListe: oppgaveliste })
+                                            }
+                                        />
+                                        <StyledAlertStripeInfo>Gir varsel, bruker må svare</StyledAlertStripeInfo>
+                                    </>
+                                )}
+                                {state.avsluttet && (
+                                    <StyledAlertStripeInfo>
+                                        Bruker kan ikke skrive mer i denne samtalen
+                                    </StyledAlertStripeInfo>
+                                )}
+                                {!state.avsluttet && (
+                                    <StyledCheckbox
+                                        label={'Avslutt samtale etter sending'}
+                                        checked={state.avsluttet}
+                                        onChange={() => updateState({ avsluttet: !state.avsluttet })}
                                     />
-                                    <StyledAlertStripeInfo>Gir varsel, bruker må svare</StyledAlertStripeInfo>
-                                </>
-                            ) : (
-                                <StyledAlertStripeInfo>Gir varsel, bruker kan ikke svare</StyledAlertStripeInfo>
-                            )}
+                                )}
+                            </Panel>
                         </UnmountClosed>
-                    </Margin>
+                    </div>
                     <Feilmelding sendNyMeldingPanelState={props.sendNyMeldingPanelState.type} />
                     <KnappWrapper>
                         <KnappBase
diff --git a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
index f2a4ffc60..65cbc8e04 100644
--- a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
+++ b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
@@ -1,21 +1,9 @@
 import * as React from 'react';
 import { FormEvent, useCallback, useMemo, useState } from 'react';
-import SendNyMelding, { OppgavelisteValg, SendNyMeldingState } from './SendNyMelding';
-import { NyMeldingValidator } from './validatorer';
-import {
-    Meldingstype,
-    SendInfomeldingRequest,
-    SendReferatRequest,
-    SendSporsmalRequest,
-    Traad
-} from '../../../../models/meldinger/meldinger';
+import { MeldingValidator } from './validatorer';
+import { SendMeldingRequest, SendReferatRequest, Traad, TraadType } from '../../../../models/meldinger/meldinger';
 import { useFodselsnummer } from '../../../../utils/customHooks';
-import {
-    InfomeldingSendtKvittering,
-    ReferatSendtKvittering,
-    MeldingSendtFeilet,
-    SporsmalSendtKvittering
-} from './SendNyMeldingKvittering';
+import { MeldingSendtFeilet, ReferatSendtKvittering, SamtaleSendtKvittering } from './SendNyMeldingKvittering';
 import { apiBaseUri } from '../../../../api/config';
 import { post } from '../../../../api/api';
 import { KvitteringNyMelding, SendNyMeldingPanelState, SendNyMeldingStatus } from './SendNyMeldingTypes';
@@ -25,6 +13,7 @@ import dialogResource from '../../../../rest/resources/dialogResource';
 import { useValgtenhet } from '../../../../context/valgtenhet-state';
 import { useQueryClient } from '@tanstack/react-query';
 import journalsakResource from '../../../../rest/resources/journalsakResource';
+import SendNyMelding, { OppgavelisteValg, SendNyMeldingState } from './SendNyMelding';
 
 interface Props {
     defaultOppgaveDestinasjon: OppgavelisteValg;
@@ -35,9 +24,10 @@ function SendNyMeldingContainer(props: Props) {
     const initialState: SendNyMeldingState = useMemo(
         () => ({
             tekst: '',
-            dialogType: Meldingstype.SAMTALEREFERAT_TELEFON,
+            traadType: TraadType.SAMTALEREFERAT,
             tema: undefined,
             sak: undefined,
+            avsluttet: false,
             oppgaveListe: props.defaultOppgaveDestinasjon,
             visFeilmeldinger: false
         }),
@@ -76,23 +66,14 @@ function SendNyMeldingContainer(props: Props) {
         return (
             <ReferatSendtKvittering
                 kvitteringNyMelding={sendNyMeldingStatus.kvitteringNyMelding}
-                request={sendNyMeldingStatus.request}
                 lukk={lukkSendtKvittering}
             />
         );
     }
 
-    if (sendNyMeldingStatus.type === SendNyMeldingStatus.SPORSMAL_SENDT) {
+    if (sendNyMeldingStatus.type === SendNyMeldingStatus.SAMTALE_SENDT) {
         return (
-            <SporsmalSendtKvittering
-                kvitteringNyMelding={sendNyMeldingStatus.kvitteringNyMelding}
-                lukk={lukkSendtKvittering}
-            />
-        );
-    }
-    if (sendNyMeldingStatus.type === SendNyMeldingStatus.INFORMELDING_SENDT) {
-        return (
-            <InfomeldingSendtKvittering
+            <SamtaleSendtKvittering
                 kvitteringNyMelding={sendNyMeldingStatus.kvitteringNyMelding}
                 lukk={lukkSendtKvittering}
             />
@@ -125,41 +106,46 @@ function SendNyMeldingContainer(props: Props) {
             queryClient.invalidateQueries(dialogResource.queryKey(fnr, valgtEnhet));
         };
 
-        if (
-            NyMeldingValidator.erGyldigReferat(state) &&
-            state.tema &&
-            state.dialogType !== Meldingstype.SPORSMAL_MODIA_UTGAAENDE &&
-            state.dialogType !== Meldingstype.INFOMELDING_MODIA_UTGAAENDE
-        ) {
+        const commonPayload = {
+            traadType: state.traadType,
+            enhet: valgtEnhet,
+            fritekst: state.tekst
+        };
+
+        if (MeldingValidator.erGyldigReferat(state) && state.tema) {
             setSendNyMeldingStatus({ type: SendNyMeldingStatus.POSTING });
-            const request: SendReferatRequest = {
-                enhet: valgtEnhet,
-                fritekst: state.tekst,
-                meldingstype: state.dialogType,
+            const request: SendMeldingRequest = {
+                ...commonPayload,
                 temagruppe: state.tema
             };
-            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendreferat`, request, 'Send-Referat')
+
+            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Referat')
                 .then((traad) => {
                     const kvitteringNyMelding: KvitteringNyMelding = {
                         fritekst: request.fritekst,
                         traad: traad
                     };
                     callback();
-                    setSendNyMeldingStatus({ type: SendNyMeldingStatus.REFERAT_SENDT, request, kvitteringNyMelding });
+                    setSendNyMeldingStatus({
+                        type: SendNyMeldingStatus.REFERAT_SENDT,
+                        request: {} as SendReferatRequest,
+                        kvitteringNyMelding
+                    });
                 })
                 .catch((error) => {
                     console.error('Send-Referat feilet', error);
                     setSendNyMeldingStatus({ type: SendNyMeldingStatus.ERROR, fritekst: request.fritekst });
                 });
-        } else if (NyMeldingValidator.erGyldigSpørsmal(state) && state.sak) {
+        } else if (MeldingValidator.erGyldigSamtale(state) && state.sak) {
             setSendNyMeldingStatus({ type: SendNyMeldingStatus.POSTING });
-            const request: SendSporsmalRequest = {
-                enhet: valgtEnhet,
-                fritekst: state.tekst,
+            const request: SendMeldingRequest = {
+                ...commonPayload,
                 sak: state.sak,
+                avsluttet: state.avsluttet,
                 erOppgaveTilknyttetAnsatt: state.oppgaveListe === OppgavelisteValg.MinListe
             };
-            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendsporsmal`, request, 'Send-Sporsmal')
+
+            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendmelding`, request, 'Send-Sporsmal')
                 .then((traad) => {
                     const kvitteringNyMelding: KvitteringNyMelding = {
                         fritekst: request.fritekst,
@@ -167,7 +153,7 @@ function SendNyMeldingContainer(props: Props) {
                     };
                     queryClient.invalidateQueries(journalsakResource.queryKey(fnr));
                     callback();
-                    setSendNyMeldingStatus({ type: SendNyMeldingStatus.SPORSMAL_SENDT, kvitteringNyMelding });
+                    setSendNyMeldingStatus({ type: SendNyMeldingStatus.SAMTALE_SENDT, kvitteringNyMelding });
                 })
                 .catch((error) => {
                     callback();
@@ -178,33 +164,6 @@ function SendNyMeldingContainer(props: Props) {
                     });
                     updateState({ visFeilmeldinger: true });
                 });
-        } else if (NyMeldingValidator.erGyldigInfomelding(state) && state.sak) {
-            setSendNyMeldingStatus({ type: SendNyMeldingStatus.POSTING });
-            const request: SendInfomeldingRequest = {
-                enhet: valgtEnhet,
-                fritekst: state.tekst,
-                sak: state.sak
-            };
-            post<Traad>(`${apiBaseUri}/dialog/${fnr}/sendinfomelding`, request, 'Send-Infomelding')
-                .then((traad) => {
-                    const kvitteringNyMelding: KvitteringNyMelding = {
-                        fritekst: request.fritekst,
-                        traad: traad
-                    };
-                    callback();
-                    setSendNyMeldingStatus({
-                        type: SendNyMeldingStatus.INFORMELDING_SENDT,
-                        kvitteringNyMelding
-                    });
-                })
-                .catch((error) => {
-                    callback();
-                    setSendNyMeldingStatus({
-                        type: SendNyMeldingStatus.ERROR,
-                        fritekst: handleFeilMelding(error)
-                    });
-                    updateState({ visFeilmeldinger: true });
-                });
         } else {
             updateState({ visFeilmeldinger: true });
         }
diff --git a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingKvittering.tsx b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingKvittering.tsx
index 5ebb45594..358b0bc4f 100644
--- a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingKvittering.tsx
+++ b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingKvittering.tsx
@@ -1,20 +1,12 @@
 import * as React from 'react';
-import { Meldingstype, SendReferatRequest } from '../../../../models/meldinger/meldinger';
 import { DialogpanelKvittering } from '../fellesStyling';
-import { meldingstypeTekst } from '../../infotabs/meldinger/utils/meldingstekster';
 import { KvitteringNyMelding, SendNyMeldingStatus } from './SendNyMeldingTypes';
 
-export function ReferatSendtKvittering(props: {
-    kvitteringNyMelding: KvitteringNyMelding;
-    request: SendReferatRequest;
-    lukk: () => void;
-}) {
-    const tittel = `${meldingstypeTekst(props.request.meldingstype)} sendt til bruker`;
+export function ReferatSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
     return (
         <DialogpanelKvittering
-            tittel={tittel}
-            fritekst={props.request.fritekst}
-            meldingstype={props.request.meldingstype}
+            tittel={'Referat sendt til bruker'}
+            fritekst={props.kvitteringNyMelding.fritekst}
             traad={props.kvitteringNyMelding.traad}
             lukk={props.lukk}
             meldingstatus={SendNyMeldingStatus.REFERAT_SENDT}
@@ -22,12 +14,11 @@ export function ReferatSendtKvittering(props: {
     );
 }
 
-export function SporsmalSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
+export function SamtaleSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
     return (
         <DialogpanelKvittering
-            tittel="Spørsmål ble sendt"
+            tittel="Samtale ble sendt"
             fritekst={props.kvitteringNyMelding.fritekst}
-            meldingstype={Meldingstype.SPORSMAL_MODIA_UTGAAENDE}
             traad={props.kvitteringNyMelding.traad}
             lukk={props.lukk}
             meldingstatus={SendNyMeldingStatus.SPORSMAL_SENDT}
@@ -35,25 +26,11 @@ export function SporsmalSendtKvittering(props: { kvitteringNyMelding: Kvittering
     );
 }
 
-export function InfomeldingSendtKvittering(props: { kvitteringNyMelding: KvitteringNyMelding; lukk: () => void }) {
-    return (
-        <DialogpanelKvittering
-            tittel="Infomelding ble sendt"
-            fritekst={props.kvitteringNyMelding.fritekst}
-            meldingstype={Meldingstype.INFOMELDING_MODIA_UTGAAENDE}
-            traad={props.kvitteringNyMelding.traad}
-            lukk={props.lukk}
-            meldingstatus={SendNyMeldingStatus.INFORMELDING_SENDT}
-        />
-    );
-}
-
 export function MeldingSendtFeilet(props: { fritekst: string; lukk: () => void }) {
     return (
         <DialogpanelKvittering
             tittel="Melding ble sendt, men feil i baksystem"
             fritekst={props.fritekst}
-            meldingstype={Meldingstype.SPORSMAL_MODIA_UTGAAENDE}
             lukk={props.lukk}
             meldingstatus={SendNyMeldingStatus.ERROR}
         />
diff --git a/src/app/personside/dialogpanel/sendMelding/VelgDialogType.tsx b/src/app/personside/dialogpanel/sendMelding/VelgDialogType.tsx
index 554e3eb65..d0e16d3cd 100644
--- a/src/app/personside/dialogpanel/sendMelding/VelgDialogType.tsx
+++ b/src/app/personside/dialogpanel/sendMelding/VelgDialogType.tsx
@@ -1,40 +1,34 @@
 import * as React from 'react';
-import { SendNyMeldingDialogType, SendNyMeldingState } from './SendNyMelding';
-import { Meldingstype } from '../../../../models/meldinger/meldinger';
+import { TraadType } from '../../../../models/meldinger/meldinger';
 import { Radio } from 'nav-frontend-skjema';
 import { VelgDialogtypeStyle } from '../fellesStyling';
+import { SendNyMeldingState } from './SendNyMelding';
 
 interface Props {
     formState: SendNyMeldingState;
-    updateDialogType: (dialogType: SendNyMeldingDialogType) => void;
+    updateTraadType: (traadType: TraadType, avsluttet: boolean) => void;
 }
 
 function VelgDialogType(props: Props) {
     return (
         <VelgDialogtypeStyle>
             <Radio
-                label="Referat telefon"
-                onChange={() => props.updateDialogType(Meldingstype.SAMTALEREFERAT_TELEFON)}
-                checked={props.formState.dialogType === Meldingstype.SAMTALEREFERAT_TELEFON}
+                label="Referat"
+                onChange={() => props.updateTraadType(TraadType.SAMTALEREFERAT, false)}
+                checked={props.formState.traadType === TraadType.SAMTALEREFERAT}
                 name="dialogtype"
             />
             <Radio
-                label="Referat oppmøte"
-                onChange={() => props.updateDialogType(Meldingstype.SAMTALEREFERAT_OPPMOTE)}
-                checked={props.formState.dialogType === Meldingstype.SAMTALEREFERAT_OPPMOTE}
-                name="dialogtype"
-            />
-            <Radio
-                label="Spørsmål"
-                onChange={() => props.updateDialogType(Meldingstype.SPORSMAL_MODIA_UTGAAENDE)}
-                checked={props.formState.dialogType === Meldingstype.SPORSMAL_MODIA_UTGAAENDE}
+                label="Samtale"
+                onChange={() => props.updateTraadType(TraadType.MELDINGSKJEDE, false)}
+                checked={props.formState.traadType !== TraadType.SAMTALEREFERAT && !props.formState.avsluttet}
                 name="dialogtype"
             />
             <Radio
                 label="Infomelding"
+                onChange={() => props.updateTraadType(TraadType.MELDINGSKJEDE, true)}
+                checked={props.formState.traadType !== TraadType.SAMTALEREFERAT && props.formState.avsluttet}
                 name="dialogtype"
-                onChange={() => props.updateDialogType(Meldingstype.INFOMELDING_MODIA_UTGAAENDE)}
-                checked={props.formState.dialogType === Meldingstype.INFOMELDING_MODIA_UTGAAENDE}
             />
         </VelgDialogtypeStyle>
     );
diff --git a/src/app/personside/dialogpanel/sendMelding/__snapshots__/SendNyMelding.test.tsx.snap b/src/app/personside/dialogpanel/sendMelding/__snapshots__/SendNyMelding.test.tsx.snap
index 573fe6cba..e061274ae 100644
--- a/src/app/personside/dialogpanel/sendMelding/__snapshots__/SendNyMelding.test.tsx.snap
+++ b/src/app/personside/dialogpanel/sendMelding/__snapshots__/SendNyMelding.test.tsx.snap
@@ -100,6 +100,21 @@ exports[`viser send ny melding 1`] = `
   padding-left: 2.25rem;
 }
 
+.c15 {
+  margin-top: 1rem;
+}
+
+.c15 label {
+  position: absolute !important;
+  height: 1px;
+  width: 1px;
+  overflow: hidden;
+  -webkit-clip: rect(1px 1px 1px 1px);
+  clip: rect(1px 1px 1px 1px);
+  -webkit-clip: rect(1px,1px,1px,1px);
+  clip: rect(1px,1px,1px,1px);
+}
+
 .c4 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -158,7 +173,7 @@ exports[`viser send ny melding 1`] = `
   padding: 1rem .5rem;
 }
 
-.c15 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -168,7 +183,7 @@ exports[`viser send ny melding 1`] = `
   flex-direction: column;
 }
 
-.c15 > * {
+.c17 > * {
   margin-bottom: 0.7rem;
 }
 
@@ -176,6 +191,10 @@ exports[`viser send ny melding 1`] = `
   margin-top: 1rem;
 }
 
+.c16 {
+  margin-top: 1rem;
+}
+
 .c3 {
   margin-bottom: 1rem !important;
 }
@@ -466,7 +485,7 @@ exports[`viser send ny melding 1`] = `
               className="skjemaelement__label"
               htmlFor="Helt tilfeldig ID"
             >
-              Referat telefon
+              Referat
             </label>
           </div>
           <div
@@ -485,26 +504,7 @@ exports[`viser send ny melding 1`] = `
               className="skjemaelement__label"
               htmlFor="Helt tilfeldig ID"
             >
-              Referat oppmøte
-            </label>
-          </div>
-          <div
-            className="skjemaelement"
-          >
-            <input
-              aria-invalid={false}
-              checked={false}
-              className="skjemaelement__input radioknapp"
-              id="Helt tilfeldig ID"
-              name="dialogtype"
-              onChange={[Function]}
-              type="radio"
-            />
-            <label
-              className="skjemaelement__label"
-              htmlFor="Helt tilfeldig ID"
-            >
-              Spørsmål
+              Samtale
             </label>
           </div>
           <div
@@ -527,9 +527,7 @@ exports[`viser send ny melding 1`] = `
             </label>
           </div>
         </div>
-        <div
-          className="SendNyMelding__Margin-h55t11-3"
-        >
+        <div>
           <fieldset
             aria-invalid={false}
             className="skjemagruppe"
@@ -639,65 +637,123 @@ exports[`viser send ny melding 1`] = `
             </div>
           </div>
           <div
-            className="c14"
+            className="panel"
           >
-            <button
-              className="knapp knapp--hoved knapp--mini"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
+            <div
+              className="c14"
             >
-              Velg sak
-            </button>
-            <p
-              className="typo-normal"
+              <button
+                className="knapp knapp--hoved knapp--mini"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                Velg sak
+              </button>
+              <p
+                className="typo-normal"
+              >
+                Ingen valgt sak
+              </p>
+            </div>
+            <div
+              className="skjemaelement c15"
             >
-              Ingen valgt sak
-            </p>
-          </div>
-          <div
-            className="alertstripe c13 alertstripe--info"
-          >
-            <span
-              className="alertstripe__ikon"
+              <label
+                className="skjemaelement__label"
+                htmlFor="Helt tilfeldig ID"
+              >
+                Oppgaveliste
+              </label>
+              <div
+                className="selectContainer input--fullbredde"
+              >
+                <select
+                  aria-invalid={false}
+                  className="skjemaelement__input"
+                  disabled={false}
+                  id="Helt tilfeldig ID"
+                  onChange={[Function]}
+                  value="MinListe"
+                >
+                  <option
+                    value="MinListe"
+                  >
+                    Svar skal til min oppgaveliste hos 
+                    valgt enhet
+                  </option>
+                  <option
+                    value="Enhetensliste"
+                  >
+                    Svar skal til 
+                    valgt enhet
+                     sin oppgaveliste
+                  </option>
+                </select>
+              </div>
+            </div>
+            <div
+              className="alertstripe c13 alertstripe--info"
             >
               <span
-                className="sr-only"
+                className="alertstripe__ikon"
               >
-                info
+                <span
+                  className="sr-only"
+                >
+                  info
+                </span>
+                <svg
+                  aria-label="info-ikon"
+                  focusable="false"
+                  height="1.5em"
+                  kind="info-sirkel-fyll"
+                  role="img"
+                  viewBox="0 0 24 24"
+                  width="1.5em"
+                >
+                  <g
+                    fill="none"
+                  >
+                    <path
+                      d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
+                      fill="#337C9B"
+                    />
+                    <path
+                      d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
+                      fill="#FFF"
+                    />
+                  </g>
+                </svg>
               </span>
-              <svg
-                aria-label="info-ikon"
-                focusable="false"
-                height="1.5em"
-                kind="info-sirkel-fyll"
-                role="img"
-                viewBox="0 0 24 24"
-                width="1.5em"
+              <div
+                className="typo-normal alertstripe__tekst"
               >
-                <g
-                  fill="none"
-                >
-                  <path
-                    d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
-                    fill="#337C9B"
-                  />
-                  <path
-                    d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
-                    fill="#FFF"
-                  />
-                </g>
-              </svg>
-            </span>
+                Gir varsel, bruker må svare
+              </div>
+            </div>
             <div
-              className="typo-normal alertstripe__tekst"
+              className="skjemaelement c16"
             >
-              Gir varsel, bruker kan ikke svare
+              <input
+                aria-invalid={false}
+                checked={false}
+                className="skjemaelement__input checkboks"
+                id="Helt tilfeldig ID"
+                onChange={[Function]}
+                type="checkbox"
+              />
+              <label
+                className="skjemaelement__label"
+                htmlFor="Helt tilfeldig ID"
+              >
+                Avslutt samtale etter sending
+              </label>
             </div>
           </div>
         </div>
         <div
-          className="c15"
+          className="c17"
         >
           <button
             className="knapp knapp--hoved"
diff --git a/src/app/personside/dialogpanel/sendMelding/nyValidatorer.ts b/src/app/personside/dialogpanel/sendMelding/nyValidatorer.ts
deleted file mode 100644
index 2dad0a69d..000000000
--- a/src/app/personside/dialogpanel/sendMelding/nyValidatorer.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NySendNyMeldingState, tekstMaksLengde } from './NySendNyMelding';
-import { TraadType } from '../../../../models/meldinger/meldinger';
-
-export class NyMeldingValidator {
-    public static tekst(state: NySendNyMeldingState) {
-        return state.tekst.length <= tekstMaksLengde && state.tekst.length > 0;
-    }
-    public static tema(state: NySendNyMeldingState) {
-        return state.tema !== undefined;
-    }
-    public static sak(state: NySendNyMeldingState) {
-        return state.sak !== undefined;
-    }
-    public static erReferat(state: NySendNyMeldingState) {
-        return state.traadType === TraadType.SAMTALEREFERAT;
-    }
-    public static erSamtale(state: NySendNyMeldingState) {
-        return state.traadType !== TraadType.SAMTALEREFERAT;
-    }
-    public static erGyldigReferat(state: NySendNyMeldingState) {
-        return this.erReferat(state) && this.tema(state) && this.tekst(state);
-    }
-    public static erGyldigSamtale(state: NySendNyMeldingState) {
-        return this.erSamtale(state) && this.sak(state) && this.tekst(state);
-    }
-}
diff --git a/src/app/personside/dialogpanel/sendMelding/validatorer.ts b/src/app/personside/dialogpanel/sendMelding/validatorer.ts
index 889a591db..4562df217 100644
--- a/src/app/personside/dialogpanel/sendMelding/validatorer.ts
+++ b/src/app/personside/dialogpanel/sendMelding/validatorer.ts
@@ -1,7 +1,7 @@
 import { SendNyMeldingState, tekstMaksLengde } from './SendNyMelding';
-import { Meldingstype } from '../../../../models/meldinger/meldinger';
+import { TraadType } from '../../../../models/meldinger/meldinger';
 
-export class NyMeldingValidator {
+export class MeldingValidator {
     public static tekst(state: SendNyMeldingState) {
         return state.tekst.length <= tekstMaksLengde && state.tekst.length > 0;
     }
@@ -12,21 +12,15 @@ export class NyMeldingValidator {
         return state.sak !== undefined;
     }
     public static erReferat(state: SendNyMeldingState) {
-        return state.dialogType !== Meldingstype.SPORSMAL_MODIA_UTGAAENDE && !this.erInfomelding(state);
+        return state.traadType === TraadType.SAMTALEREFERAT;
     }
-    public static erSporsmal(state: SendNyMeldingState) {
-        return !this.erReferat(state) && !this.erInfomelding(state);
+    public static erSamtale(state: SendNyMeldingState) {
+        return state.traadType !== TraadType.SAMTALEREFERAT;
     }
     public static erGyldigReferat(state: SendNyMeldingState) {
         return this.erReferat(state) && this.tema(state) && this.tekst(state);
     }
-    public static erGyldigSpørsmal(state: SendNyMeldingState) {
-        return this.erSporsmal(state) && this.sak(state) && this.tekst(state);
-    }
-    public static erInfomelding(state: SendNyMeldingState) {
-        return state.dialogType === Meldingstype.INFOMELDING_MODIA_UTGAAENDE;
-    }
-    public static erGyldigInfomelding(state: SendNyMeldingState) {
-        return this.erInfomelding(state) && this.sak(state) && this.tekst(state);
+    public static erGyldigSamtale(state: SendNyMeldingState) {
+        return this.erSamtale(state) && this.sak(state) && this.tekst(state);
     }
 }
diff --git a/src/app/personside/infotabs/InfoTabEnum.ts b/src/app/personside/infotabs/InfoTabEnum.ts
index 4e15f72e8..4b34e982a 100644
--- a/src/app/personside/infotabs/InfoTabEnum.ts
+++ b/src/app/personside/infotabs/InfoTabEnum.ts
@@ -15,16 +15,6 @@ export interface InfotabConfig {
 
 export type Infotabs = Record<InfotabsType, InfotabConfig>;
 export const INFOTABS: Infotabs = {
-    OVERSIKT: { tittel: 'Oversikt', path: 'oversikt' },
-    OPPFOLGING: { tittel: 'Oppfølging', path: 'oppfolging' },
-    MELDINGER: { tittel: 'Meldinger', path: 'meldinger' },
-    UTBETALING: { tittel: 'Utbetaling', path: 'utbetaling' },
-    SAKER: { tittel: 'Saker', path: 'saker' },
-    YTELSER: { tittel: 'Ytelser', path: 'ytelser' },
-    VARSLER: { tittel: 'Varsler', path: 'varsler' }
-};
-
-export const NY_INFOTABS: Infotabs = {
     OVERSIKT: { tittel: 'Oversikt', path: 'oversikt' },
     OPPFOLGING: { tittel: 'Oppfølging', path: 'oppfolging' },
     MELDINGER: { tittel: 'Kommunikasjon', path: 'meldinger' },
diff --git a/src/app/personside/infotabs/InfoTabs.tsx b/src/app/personside/infotabs/InfoTabs.tsx
index 216fc7ec7..2ffea083d 100644
--- a/src/app/personside/infotabs/InfoTabs.tsx
+++ b/src/app/personside/infotabs/InfoTabs.tsx
@@ -22,10 +22,6 @@ import { guid } from 'nav-frontend-js-utils';
 import { useOpenTab } from './utils/useOpenTab';
 import { MeldingsokProvider } from '../../../context/meldingsok';
 import { useVisittkortState } from '../../../context/visittkort-state';
-import IfFeatureToggleOn from '../../../components/featureToggle/IfFeatureToggleOn';
-import { FeatureToggles } from '../../../components/featureToggle/toggleIDs';
-import IfFeatureToggleOff from '../../../components/featureToggle/IfFeatureToggleOff';
-import NyTabKnapper from './NyTabKnapper';
 
 const StyledArticle = styled.article`
     display: flex;
@@ -71,12 +67,7 @@ function InfoTabs() {
     return (
         <ErrorBoundary boundaryName="InfoTabs">
             <HandleInfotabsHotkeys />
-            <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                <NyTabKnapper openTab={openTab} onTabChange={updateRouterPath} />
-            </IfFeatureToggleOn>
-            <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                <TabKnapper openTab={openTab} onTabChange={updateRouterPath} />
-            </IfFeatureToggleOff>
+            <TabKnapper openTab={openTab} onTabChange={updateRouterPath} />
             <ErrorBoundary boundaryName={'Open tab: ' + openTab.tittel}>
                 <StyledArticle ref={openTabRef} onScroll={storeCroll} aria-labelledby={articleId.current}>
                     <h2
diff --git a/src/app/personside/infotabs/NyTabKnapper.tsx b/src/app/personside/infotabs/NyTabKnapper.tsx
deleted file mode 100644
index 7de891cfa..000000000
--- a/src/app/personside/infotabs/NyTabKnapper.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import * as React from 'react';
-import { InfotabConfig, NY_INFOTABS } from './InfoTabEnum';
-import styled, { css } from 'styled-components/macro';
-import theme, { pxToRem } from '../../../styles/personOversiktTheme';
-
-interface TabPanelProps {
-    onTabChange: Function;
-    openTab: InfotabConfig;
-}
-
-const TabKnapperNav = styled.nav`
-    flex-shrink: 0;
-    border-top: ${theme.border.skille};
-    border-bottom: ${theme.border.skille};
-    background-color: ${theme.color.navLysGra};
-`;
-
-const TabListStyle = styled.ul`
-    display: flex;
-    flex-flow: row wrap;
-    width: 100%;
-    > *:not(:last-child) {
-        margin-right: 0.2em;
-    }
-    > *:not(:first-child) {
-        margin-left: 0.2em;
-    }
-`;
-
-const KnappWrapper = styled.li`
-    flex-grow: 1;
-    box-sizing: border-box;
-`;
-
-interface TabKnappProps {
-    valgt: boolean;
-}
-
-const TabKnapp = styled.button<TabKnappProps>`
-    width: 100%;
-    box-sizing: border-box;
-    background-color: transparent;
-    margin-top: ${pxToRem(4)};
-    padding: ${theme.margin.layout};
-    border: none;
-    border-bottom: 4px solid ${(props) => (props.valgt ? theme.color.lenkeSelected : 'transparent')};
-    ${(props) =>
-        props.valgt &&
-        css`
-            color: ${theme.color.lenkeSelected};
-        `};
-    text-align: center;
-    cursor: pointer;
-    transition: border 0.3s;
-    font-weight: bold;
-    &:focus {
-        ${theme.focus};
-        border-radius: ${theme.borderRadius.layout};
-    }
-    &:hover {
-        border-bottom: 4px solid ${theme.color.lenkeHover};
-    }
-`;
-
-function NyTabKnapper(props: TabPanelProps) {
-    const knapper = Object.keys(NY_INFOTABS).map((key) => {
-        const erValgt = NY_INFOTABS[key] === props.openTab;
-        return (
-            <KnappWrapper key={key} role="presentation">
-                <TabKnapp role="tab" aria-selected={erValgt} valgt={erValgt} onClick={() => props.onTabChange(key)}>
-                    {NY_INFOTABS[key].tittel}
-                </TabKnapp>
-            </KnappWrapper>
-        );
-    });
-
-    return (
-        <TabKnapperNav aria-label="Faner">
-            <h2 className="sr-only">Faner</h2>
-            <TabListStyle role="tablist">{knapper}</TabListStyle>
-        </TabKnapperNav>
-    );
-}
-
-export default NyTabKnapper;
diff --git a/src/app/personside/infotabs/TabKnapper.tsx b/src/app/personside/infotabs/TabKnapper.tsx
index 89bde2f5e..c387fd06b 100644
--- a/src/app/personside/infotabs/TabKnapper.tsx
+++ b/src/app/personside/infotabs/TabKnapper.tsx
@@ -43,8 +43,8 @@ const TabKnapp = styled.button<TabKnappProps>`
     margin-top: ${pxToRem(4)};
     padding: ${theme.margin.layout};
     border: none;
-    border-bottom: 4px solid ${props => (props.valgt ? theme.color.lenkeSelected : 'transparent')};
-    ${props =>
+    border-bottom: 4px solid ${(props) => (props.valgt ? theme.color.lenkeSelected : 'transparent')};
+    ${(props) =>
         props.valgt &&
         css`
             color: ${theme.color.lenkeSelected};
@@ -63,7 +63,7 @@ const TabKnapp = styled.button<TabKnappProps>`
 `;
 
 function TabKnapper(props: TabPanelProps) {
-    const knapper = Object.keys(INFOTABS).map(key => {
+    const knapper = Object.keys(INFOTABS).map((key) => {
         const erValgt = INFOTABS[key] === props.openTab;
         return (
             <KnappWrapper key={key} role="presentation">
diff --git a/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx b/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx
index faf2b30cd..b79633db3 100644
--- a/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx
+++ b/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx
@@ -28,7 +28,7 @@ test('bytter til riktig tab og setter fokus på riktig melding ved bruk av dyple
 
     clickOnMeldingerIOversikt(infoTabs);
 
-    expect(getAktivTab(infoTabs).toLowerCase()).toContain(INFOTABS.MELDINGER.path);
+    expect(getAktivTab(infoTabs)).toContain(INFOTABS.MELDINGER.tittel);
 
     const checkedMelding = infoTabs.find('input[checked=true].' + meldingerTest.melding).html();
     const expectedElement = infoTabs
diff --git a/src/app/personside/infotabs/meldinger/traadliste/NyTraadSammendrag.tsx b/src/app/personside/infotabs/meldinger/traadliste/NyTraadSammendrag.tsx
deleted file mode 100644
index 9bb3bf161..000000000
--- a/src/app/personside/infotabs/meldinger/traadliste/NyTraadSammendrag.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { Melding, Traad } from '../../../../../models/meldinger/meldinger';
-import { erFeilsendt, getFormattertMeldingsDato, nyesteMelding, traadstittel } from '../utils/meldingerUtils';
-import { useAppState } from '../../../../../utils/customHooks';
-import Meldingsikon from '../utils/Meldingsikon';
-import { Element, Normaltekst } from 'nav-frontend-typografi';
-import { UnmountClosed } from 'react-collapse';
-import { EtikettAdvarsel, EtikettFokus, EtikettSuksess } from 'nav-frontend-etiketter';
-import * as React from 'react';
-import useTildelteOppgaver from '../../../../../utils/hooks/useTildelteOppgaver';
-import { Temagruppe } from '../../../../../models/temagrupper';
-import styled from 'styled-components/macro';
-
-const ContentStyle = styled.div`
-    display: flex;
-    flex-direction: column;
-    /* IE11-fix*/
-    flex-grow: 1;
-    width: 0;
-    margin-left: 0.8rem;
-    overflow-wrap: break-word;
-    .order-first {
-        order: 0;
-    }
-    .order-second {
-        order: 1;
-    }
-    .order-third {
-        order: 3;
-    }
-`;
-
-const EtikettStyling = styled.div`
-    > *:not(:last-child) {
-        margin-bottom: 0.2rem;
-        margin-right: 0.2rem;
-    }
-    display: flex;
-    flex-wrap: wrap;
-    align-items: flex-start;
-    margin-top: 0.2rem;
-`;
-
-const UUcustomOrder = styled.div`
-    display: flex;
-    flex-direction: column;
-    .order-first {
-        order: 0;
-    }
-    .order-second {
-        order: 1;
-    }
-`;
-
-const Style = styled.div`
-    display: flex;
-    > *:last-child {
-        flex-grow: 1;
-    }
-`;
-
-const PreviewStyle = styled(Normaltekst)`
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-`;
-
-function NyTraadSammendrag(props: { traad: Traad }) {
-    const sisteMelding = nyesteMelding(props.traad);
-    const underArbeid = useAppState((state) => state.oppgaver.dialogpanelTraad?.traadId === props.traad.traadId);
-    const datoTekst = getFormattertMeldingsDato(sisteMelding);
-    const tittel = traadstittel(props.traad);
-    return (
-        <Style>
-            <span className="sr-only">({props.traad.meldinger.length})</span>
-            <Meldingsikon traad={props.traad} />
-            <ContentStyle>
-                <UUcustomOrder className="order-first">
-                    <Element className="order-second">{tittel}</Element>
-                    <Normaltekst className="order-first">{datoTekst}</Normaltekst>
-                </UUcustomOrder>
-                <EtikettStyling className="order-third">
-                    <UnmountClosed isOpened={underArbeid}>
-                        <EtikettFokus>Under arbeid</EtikettFokus>
-                    </UnmountClosed>
-                    <TildeltSaksbehandlerEtikett traadId={props.traad.traadId} />
-                    <SlettetEtikett melding={sisteMelding} />
-                    <FeilsendtEtikett traad={props.traad} />
-                </EtikettStyling>
-                <PreviewStyle className="order-second">{sisteMelding.fritekst}</PreviewStyle>
-            </ContentStyle>
-        </Style>
-    );
-}
-
-function TildeltSaksbehandlerEtikett({ traadId }: { traadId: string }) {
-    const tildelteOppgaver = useTildelteOppgaver();
-
-    if (tildelteOppgaver.paaBruker.map((oppgave) => oppgave.traadId).includes(traadId)) {
-        return <EtikettSuksess>Tildelt meg</EtikettSuksess>;
-    }
-
-    return null;
-}
-
-function FeilsendtEtikett({ traad }: { traad: Traad }) {
-    if (erFeilsendt(traad)) {
-        return <EtikettAdvarsel>Feilsendt</EtikettAdvarsel>;
-    }
-    return null;
-}
-
-function SlettetEtikett({ melding }: { melding: Melding }) {
-    if (melding.temagruppe === Temagruppe.InnholdSlettet) {
-        return <EtikettAdvarsel>Slettet</EtikettAdvarsel>;
-    }
-
-    return null;
-}
-
-export default NyTraadSammendrag;
diff --git a/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx b/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx
index dab9cb880..6ac2db707 100644
--- a/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx
+++ b/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx
@@ -82,7 +82,7 @@ function PrintAlleMeldinger({ traader }: { traader: Traad[] }) {
 
     return (
         <>
-            <PrintKnapp tittel={'Skriv ut alle meldinger'} onClick={() => printer?.triggerPrint()} />
+            <PrintKnapp tittel={'Skriv ut all kommunikasjon'} onClick={() => printer?.triggerPrint()} />
             <PrinterWrapper>
                 {traader.map((traad) => (
                     <MeldingerPrintMarkup key={traad.traadId} valgtTraad={traad} />
@@ -131,7 +131,7 @@ function TraadListe(props: Props) {
         </LenkeKnapp>
     );
 
-    const meldingTekst = props.traader.length === 1 ? 'melding' : 'meldinger';
+    const meldingTekst = props.traader.length === 1 ? 'kommunikasjon' : 'kommunikasjoner';
     const soketreffTekst =
         props.traaderEtterSokOgFiltrering.length !== props.traader.length
             ? `Søket traff ${props.traaderEtterSokOgFiltrering.length} av ${props.traader.length} ${meldingTekst}`
@@ -162,8 +162,8 @@ function TraadListe(props: Props) {
                             }
                             value={meldingsok.query}
                             onChange={onMeldingerSok}
-                            label={'Søk etter melding'}
-                            placeholder={'Søk etter melding'}
+                            label={'Søk etter kommunikasjon'}
+                            placeholder={'Søk etter kommunikasjon'}
                             className={'move-input-label'}
                         />
                     </InputStyle>
diff --git a/src/app/personside/infotabs/meldinger/traadliste/TraadListeElement.tsx b/src/app/personside/infotabs/meldinger/traadliste/TraadListeElement.tsx
index 49a2b652a..69fc62b97 100644
--- a/src/app/personside/infotabs/meldinger/traadliste/TraadListeElement.tsx
+++ b/src/app/personside/infotabs/meldinger/traadliste/TraadListeElement.tsx
@@ -10,10 +10,6 @@ import { HoyreChevron } from 'nav-frontend-chevron';
 import TraadSammendrag from './TraadSammendrag';
 import { guid } from 'nav-frontend-js-utils';
 import { valgtMeldingKlasse } from './TraadListe';
-import IfFeatureToggleOff from '../../../../../components/featureToggle/IfFeatureToggleOff';
-import { FeatureToggles } from '../../../../../components/featureToggle/toggleIDs';
-import IfFeatureToggleOn from '../../../../../components/featureToggle/IfFeatureToggleOn';
-import NyTraadSammendrag from './NyTraadSammendrag';
 
 interface Props {
     traad: Traad;
@@ -87,12 +83,7 @@ function TraadListeElement(props: Props) {
             <StyledLabel htmlFor={id.current}>
                 {props.tillegskomponent}
                 <FlexGrow>
-                    <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                        <NyTraadSammendrag traad={props.traad} />
-                    </IfFeatureToggleOn>
-                    <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                        <TraadSammendrag traad={props.traad} />
-                    </IfFeatureToggleOff>
+                    <TraadSammendrag traad={props.traad} />
                 </FlexGrow>
                 <ChevronStyling className="hover-animation">
                     <HoyreChevron />
diff --git a/src/app/personside/infotabs/meldinger/traadliste/TraadSammendrag.tsx b/src/app/personside/infotabs/meldinger/traadliste/TraadSammendrag.tsx
index d3d7a4fb1..08f4956d2 100644
--- a/src/app/personside/infotabs/meldinger/traadliste/TraadSammendrag.tsx
+++ b/src/app/personside/infotabs/meldinger/traadliste/TraadSammendrag.tsx
@@ -1,5 +1,5 @@
 import { Melding, Traad } from '../../../../../models/meldinger/meldinger';
-import { erFeilsendt, getFormattertMeldingsDato, meldingstittel, nyesteMelding } from '../utils/meldingerUtils';
+import { erFeilsendt, getFormattertMeldingsDato, nyesteMelding, traadstittel } from '../utils/meldingerUtils';
 import { useAppState } from '../../../../../utils/customHooks';
 import Meldingsikon from '../utils/Meldingsikon';
 import { Element, Normaltekst } from 'nav-frontend-typografi';
@@ -68,7 +68,7 @@ function TraadSammendrag(props: { traad: Traad }) {
     const sisteMelding = nyesteMelding(props.traad);
     const underArbeid = useAppState((state) => state.oppgaver.dialogpanelTraad?.traadId === props.traad.traadId);
     const datoTekst = getFormattertMeldingsDato(sisteMelding);
-    const tittel = meldingstittel(sisteMelding);
+    const tittel = traadstittel(props.traad);
     return (
         <Style>
             <span className="sr-only">({props.traad.meldinger.length})</span>
diff --git a/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap b/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap
index 46e5375c4..37a9b9a70 100644
--- a/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap
+++ b/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap
@@ -346,14 +346,14 @@ exports[`Viser Traadliste 1`] = `
             className="skjemaelement__label"
             htmlFor="Helt tilfeldig ID"
           >
-            Søk etter melding
+            Søk etter kommunikasjon
           </label>
           <input
             aria-invalid={false}
             className="skjemaelement__input input--fullbredde"
             id="Helt tilfeldig ID"
             onChange={[Function]}
-            placeholder="Søk etter melding"
+            placeholder="Søk etter kommunikasjon"
             type="text"
             value=""
           />
@@ -370,7 +370,7 @@ exports[`Viser Traadliste 1`] = `
           <span
             className="typo-normal"
           >
-            Skriv ut alle meldinger
+            Skriv ut all kommunikasjon
           </span>
            
           <svg
@@ -692,7 +692,7 @@ exports[`Viser Traadliste 1`] = `
           aria-live="assertive"
           className="typo-normal"
         >
-          Totalt 1 melding
+          Totalt 1 kommunikasjon
         </p>
       </div>
     </article>
@@ -701,7 +701,7 @@ exports[`Viser Traadliste 1`] = `
       id="Helt tilfeldig ID"
     >
       Meldingsliste - 
-      Totalt 1 melding
+      Totalt 1 kommunikasjon
     </h3>
     <ol
       aria-labelledby="Helt tilfeldig ID"
@@ -771,7 +771,7 @@ exports[`Viser Traadliste 1`] = `
                   <p
                     className="typo-element order-second"
                   >
-                    Spørsmål fra NAV - Arbeid
+                    Ukjent meldingstype: undefined
                   </p>
                   <p
                     className="typo-normal order-first"
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/Enkeltmelding.tsx b/src/app/personside/infotabs/meldinger/traadvisning/Enkeltmelding.tsx
index 1ac1f033a..fd6dd08ec 100644
--- a/src/app/personside/infotabs/meldinger/traadvisning/Enkeltmelding.tsx
+++ b/src/app/personside/infotabs/meldinger/traadvisning/Enkeltmelding.tsx
@@ -2,17 +2,16 @@ import * as React from 'react';
 import { useRef } from 'react';
 import { LestStatus, Melding } from '../../../../../models/meldinger/meldinger';
 import Snakkeboble from 'nav-frontend-snakkeboble';
-import { Normaltekst } from 'nav-frontend-typografi';
-import { erChatMelding, erMeldingFraBruker, erMeldingFraNav, meldingstittel } from '../utils/meldingerUtils';
+import { erMeldingFraBruker, erMeldingFraNav } from '../utils/meldingerUtils';
 import { formatterDatoTid } from '../../../../../utils/date-utils';
 import styled from 'styled-components/macro';
 import Tekstomrade, { createDynamicHighlightingRule, defaultRules, Rule } from 'nav-frontend-tekstomrade';
 import { rule as sladdRule } from '../../../../../utils/sladdrule';
-import Etikett from 'nav-frontend-etiketter';
 import { guid } from 'nav-frontend-js-utils';
 import theme from '../../../../../styles/personOversiktTheme';
 import './enkeltmelding.less';
-import { SpaceBetween } from '../../../../../components/common-styled-components';
+import ReadIcon from '../../../../../svg/ReadIcon';
+import UnReadIcon from '../../../../../svg/UnReadIcon';
 
 interface Props {
     melding: Melding;
@@ -23,6 +22,7 @@ interface Props {
 const StyledLi = styled.li`
     .snakkeboble-panel {
         flex-basis: 40rem;
+        padding: 0.5rem 0.5rem 0.3rem;
     }
     a {
         word-break: break-word; /* Hvis ikke kan snakkeboblen vokse seg ut av container uten mulighet for scroll */
@@ -47,11 +47,9 @@ const StyledLi = styled.li`
     }
 `;
 
-const BoldTekstomrade = styled(Tekstomrade)`
-    font-weight: 600;
-`;
-const Topptekst = styled.div`
-    /* Trengs for borders */
+const MeldingInfoWrapper = styled.div`
+    display: flex;
+    gap: 0.5rem;
 `;
 
 const SnakkebobleWrapper = styled.div`
@@ -61,56 +59,47 @@ const SnakkebobleWrapper = styled.div`
         ${theme.highlight}
     }
     > *:not(:last-child) {
-        border-bottom: ${theme.border.skilleSvak};
-        padding-bottom: 0.7rem;
         margin-bottom: 0.5rem;
     }
 `;
 
-const StyledTekstomrade = styled(Tekstomrade)`
-    p {
-        margin-bottom: 0 !important;
-    }
+const StyledText = styled.p`
+    font-size: 0.85rem;
 `;
 
-function MeldingLestEtikett({ melding }: { melding: Melding }) {
-    if (erMeldingFraBruker(melding.meldingstype) || erChatMelding(melding.meldingstype)) {
-        return null;
-    }
-    if (melding.status === LestStatus.Lest) {
-        return <Etikett type="suksess">Lest</Etikett>;
-    }
-    if (melding.status === LestStatus.IkkeLest) {
-        return <Etikett type="advarsel">Ulest</Etikett>;
-    }
-    return null;
-}
+const StyledMeldingStatus = styled.div`
+    display: flex;
+    gap: 0.3rem;
+    margin-left: auto;
+`;
 
 export function Avsender({ melding, rule }: { melding: Melding; rule?: Rule }) {
     if (erMeldingFraBruker(melding.meldingstype)) {
         return null;
     }
     const avsender = `Skrevet av ${melding.skrevetAvTekst}`;
-    return (
-        <StyledTekstomrade className={'typo-normal'} rules={rule && [rule]}>
-            {avsender}
-        </StyledTekstomrade>
-    );
+    return <StyledText>{avsender}</StyledText>;
 }
 
 export function LestDato({ melding }: { melding: Melding }) {
-    if (melding.status === LestStatus.IkkeLest || erMeldingFraBruker(melding.meldingstype)) {
+    if (erMeldingFraBruker(melding.meldingstype)) {
         return null;
     }
-    return (
-        <Normaltekst>
-            {melding.lestDato ? `Melding lest: ${formatterDatoTid(melding.lestDato)}` : 'Melding ikke lest'}
-        </Normaltekst>
-    );
+    const lestDato =
+        melding.lestDato && melding.status !== LestStatus.IkkeLest
+            ? `Lest: ${formatterDatoTid(melding.lestDato)}`
+            : 'Ikke lest';
+    return <StyledText>{lestDato}</StyledText>;
 }
+export function LestStatusIcon({ melding }: { melding: Melding }) {
+    if (erMeldingFraBruker(melding.meldingstype)) {
+        return null;
+    }
+    return melding.status === LestStatus.IkkeLest ? <UnReadIcon /> : <ReadIcon />;
+}
+
 function EnkeltMelding(props: Props) {
     const fraNav = erMeldingFraNav(props.melding.meldingstype);
-    const tittel = meldingstittel(props.melding);
     const tittelId = useRef(guid());
     const datoTekst = props.melding.ferdigstiltDato
         ? formatterDatoTid(props.melding.ferdigstiltDato)
@@ -122,21 +111,19 @@ function EnkeltMelding(props: Props) {
             <article aria-labelledby={tittelId.current}>
                 <Snakkeboble pilHoyre={fraNav} ikonClass={fraNav ? 'nav-ikon' : 'bruker-ikon'}>
                     <SnakkebobleWrapper>
-                        <Topptekst>
-                            <SpaceBetween>
-                                <h4 id={tittelId.current}>
-                                    <span className="sr-only">Melding {props.meldingsNummer}</span>
-                                    <BoldTekstomrade rules={[highlightRule]}>{tittel}</BoldTekstomrade>
-                                </h4>
-                                <MeldingLestEtikett melding={props.melding} />
-                            </SpaceBetween>
-                            <Tekstomrade rules={[highlightRule]}>{datoTekst}</Tekstomrade>
-                            <LestDato melding={props.melding} />
-                            <Avsender melding={props.melding} rule={highlightRule} />
-                        </Topptekst>
                         <Tekstomrade rules={[sladdRule, highlightRule, ...defaultRules]}>
                             {props.melding.fritekst}
                         </Tekstomrade>
+                        <div>
+                            <MeldingInfoWrapper>
+                                <StyledText>{datoTekst}</StyledText>
+                                <Avsender melding={props.melding} />
+                                <StyledMeldingStatus>
+                                    <LestDato melding={props.melding} />
+                                    <LestStatusIcon melding={props.melding} />
+                                </StyledMeldingStatus>
+                            </MeldingInfoWrapper>
+                        </div>
                     </SnakkebobleWrapper>
                 </Snakkeboble>
             </article>
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/NyEnkeltmelding.tsx b/src/app/personside/infotabs/meldinger/traadvisning/NyEnkeltmelding.tsx
deleted file mode 100644
index 6621fb93d..000000000
--- a/src/app/personside/infotabs/meldinger/traadvisning/NyEnkeltmelding.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import * as React from 'react';
-import { useRef } from 'react';
-import { LestStatus, Melding } from '../../../../../models/meldinger/meldinger';
-import Snakkeboble from 'nav-frontend-snakkeboble';
-import { erMeldingFraBruker, erMeldingFraNav } from '../utils/meldingerUtils';
-import { formatterDatoTid } from '../../../../../utils/date-utils';
-import styled from 'styled-components/macro';
-import Tekstomrade, { createDynamicHighlightingRule, defaultRules, Rule } from 'nav-frontend-tekstomrade';
-import { rule as sladdRule } from '../../../../../utils/sladdrule';
-import { guid } from 'nav-frontend-js-utils';
-import theme from '../../../../../styles/personOversiktTheme';
-import './enkeltmelding.less';
-import ReadIcon from '../../../../../svg/ReadIcon';
-import UnReadIcon from '../../../../../svg/UnReadIcon';
-
-interface Props {
-    melding: Melding;
-    sokeord: string;
-    meldingsNummer: number;
-}
-
-const StyledLi = styled.li`
-    .snakkeboble-panel {
-        flex-basis: 40rem;
-        padding: 0.5rem 0.5rem 0.3rem;
-    }
-    a {
-        word-break: break-word; /* Hvis ikke kan snakkeboblen vokse seg ut av container uten mulighet for scroll */
-    }
-    .snakkeboble {
-        margin: 0;
-    }
-    @media print {
-        page-break-inside: avoid;
-        border: ${theme.border.skille};
-        margin-bottom: 2rem;
-
-        .snakkeboble__snakkeboble-pil-container,
-        .nav-ikon,
-        .bruker-ikon {
-            display: none;
-        }
-
-        .snakkeboble-panel {
-            flex-basis: 100%;
-        }
-    }
-`;
-
-const MeldingInfoWrapper = styled.div`
-    display: flex;
-    gap: 0.5rem;
-`;
-
-const SnakkebobleWrapper = styled.div`
-    text-align: left;
-    em {
-        font-style: normal;
-        ${theme.highlight}
-    }
-    > *:not(:last-child) {
-        margin-bottom: 0.5rem;
-    }
-`;
-
-const StyledText = styled.p`
-    font-size: 0.85rem;
-`;
-
-const StyledMeldingStatus = styled.div`
-    display: flex;
-    gap: 0.3rem;
-    margin-left: auto;
-`;
-
-export function Avsender({ melding, rule }: { melding: Melding; rule?: Rule }) {
-    if (erMeldingFraBruker(melding.meldingstype)) {
-        return null;
-    }
-    const avsender = `Skrevet av ${melding.skrevetAvTekst}`;
-    return <StyledText>{avsender}</StyledText>;
-}
-
-export function LestDato({ melding }: { melding: Melding }) {
-    if (erMeldingFraBruker(melding.meldingstype)) {
-        return null;
-    }
-    const lestDato =
-        melding.lestDato && melding.status !== LestStatus.IkkeLest
-            ? `Lest: ${formatterDatoTid(melding.lestDato)}`
-            : 'Ikke lest';
-    return <StyledText>{lestDato}</StyledText>;
-}
-export function LestStatusIcon({ melding }: { melding: Melding }) {
-    if (erMeldingFraBruker(melding.meldingstype)) {
-        return null;
-    }
-    return melding.status === LestStatus.IkkeLest ? <UnReadIcon /> : <ReadIcon />;
-}
-
-function NyEnkeltMelding(props: Props) {
-    const fraNav = erMeldingFraNav(props.melding.meldingstype);
-    const tittelId = useRef(guid());
-    const datoTekst = props.melding.ferdigstiltDato
-        ? formatterDatoTid(props.melding.ferdigstiltDato)
-        : formatterDatoTid(props.melding.opprettetDato);
-    const highlightRule = createDynamicHighlightingRule(props.sokeord.split(' '));
-
-    return (
-        <StyledLi className="snakkeboble_ikoner">
-            <article aria-labelledby={tittelId.current}>
-                <Snakkeboble pilHoyre={fraNav} ikonClass={fraNav ? 'nav-ikon' : 'bruker-ikon'}>
-                    <SnakkebobleWrapper>
-                        <Tekstomrade rules={[sladdRule, highlightRule, ...defaultRules]}>
-                            {props.melding.fritekst}
-                        </Tekstomrade>
-                        <div>
-                            <MeldingInfoWrapper>
-                                <StyledText>{datoTekst}</StyledText>
-                                <Avsender melding={props.melding} />
-                                <StyledMeldingStatus>
-                                    <LestDato melding={props.melding} />
-                                    <LestStatusIcon melding={props.melding} />
-                                </StyledMeldingStatus>
-                            </MeldingInfoWrapper>
-                        </div>
-                    </SnakkebobleWrapper>
-                </Snakkeboble>
-            </article>
-        </StyledLi>
-    );
-}
-
-export default NyEnkeltMelding;
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/NyTraadVisning.tsx b/src/app/personside/infotabs/meldinger/traadvisning/NyTraadVisning.tsx
deleted file mode 100644
index bcc489606..000000000
--- a/src/app/personside/infotabs/meldinger/traadvisning/NyTraadVisning.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import * as React from 'react';
-import styled from 'styled-components/macro';
-import { datoSynkende, formatterDato, formatterDatoTid } from '../../../../../utils/date-utils';
-import NyEnkeltMelding from './NyEnkeltmelding';
-import theme from '../../../../../styles/personOversiktTheme';
-import { useDispatch } from 'react-redux';
-import { Hovedknapp } from 'nav-frontend-knapper';
-import { setValgtTraadDialogpanel } from '../../../../../redux/oppgave/actions';
-import { useAppState } from '../../../../../utils/customHooks';
-import { AlertStripeInfo } from 'nav-frontend-alertstriper';
-import { Traad } from '../../../../../models/meldinger/meldinger';
-import {
-    eldsteMelding,
-    nyesteMelding,
-    saksbehandlerTekst,
-    traadKanBesvares,
-    traadstittel
-} from '../utils/meldingerUtils';
-import { formaterDato } from '../../../../../utils/string-utils';
-import { loggEvent } from '../../../../../utils/logger/frontendLogger';
-import { Printer } from '../../../../../utils/print/usePrinter';
-import Ekspanderbartpanel from 'nav-frontend-ekspanderbartpanel';
-import { Normaltekst, UndertekstBold, Undertittel } from 'nav-frontend-typografi';
-import { useDialogpanelState } from '../../../../../context/dialogpanel-state';
-import Panel from 'nav-frontend-paneler';
-
-interface Props {
-    valgtTraad: Traad;
-    sokeord: string;
-    printer: Printer;
-}
-
-const VisningStyle = styled.section`
-    flex-grow: 1;
-    > *:last-child {
-        margin-top: ${theme.margin.layout};
-    }
-`;
-
-const KnappWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-`;
-
-const TopplinjeTittel = styled(Undertittel)`
-    margin-bottom: 0.3rem;
-`;
-
-const StyledAlertStripeInfo = styled(AlertStripeInfo)`
-    padding: 0.5rem 0.5rem 0.5rem 0.5rem;
-    margin-bottom: 0.3rem;
-`;
-
-function AlleMeldinger({ traad, sokeord }: { traad: Traad; sokeord: string }) {
-    const meldingskomponenter = traad.meldinger
-        .sort(datoSynkende((melding) => melding.opprettetDato))
-        .map((melding, index) => {
-            const meldingnummer = traad.meldinger.length - index;
-            return (
-                <NyEnkeltMelding sokeord={sokeord} melding={melding} key={melding.id} meldingsNummer={meldingnummer} />
-            );
-        });
-
-    return <ol aria-label="Dialog">{meldingskomponenter}</ol>;
-}
-
-function Topplinje({ valgtTraad }: { valgtTraad: Traad }) {
-    const dispatch = useDispatch();
-    const dialogpanel = useDialogpanelState();
-    const dialogpanelTraad = useAppState((state) => state.oppgaver.dialogpanelTraad);
-
-    const kanBesvares = traadKanBesvares(valgtTraad);
-    const melding = eldsteMelding(valgtTraad);
-
-    if (melding.markertSomFeilsendtAv || melding.sendtTilSladding || (melding.avsluttetDato && !kanBesvares)) {
-        return (
-            <>
-                {melding.markertSomFeilsendtAv && (
-                    <StyledAlertStripeInfo>
-                        Markert som feilsendt av {saksbehandlerTekst(melding.markertSomFeilsendtAv)}{' '}
-                        {melding.ferdigstiltDato && formaterDato(melding.ferdigstiltDato)}
-                    </StyledAlertStripeInfo>
-                )}
-                {melding.sendtTilSladding && (
-                    <StyledAlertStripeInfo>Tråden ligger til behandling for sladding</StyledAlertStripeInfo>
-                )}
-                {melding.avsluttetDato && !kanBesvares && (
-                    <StyledAlertStripeInfo>Samtalen er avsluttet av {melding.skrevetAvTekst}</StyledAlertStripeInfo>
-                )}
-            </>
-        );
-    }
-
-    const handleNyMelding = () => {
-        valgtTraad && dispatch(setValgtTraadDialogpanel(valgtTraad));
-        dialogpanel.setApent(true);
-        loggEvent('Ny melding knapp', 'Meldinger');
-    };
-
-    if (dialogpanelTraad?.traadId === valgtTraad.traadId) {
-        return <StyledAlertStripeInfo>Under arbeid</StyledAlertStripeInfo>;
-    }
-
-    if (kanBesvares) {
-        return (
-            <KnappWrapper>
-                <Hovedknapp onClick={handleNyMelding}>Ny melding</Hovedknapp>
-            </KnappWrapper>
-        );
-    } else {
-        return null;
-    }
-}
-
-const StyledJournalforingPanel = styled(Ekspanderbartpanel)`
-    margin-top: 0.8rem;
-    .ekspanderbartPanel__hode,
-    .ekspanderbartPanel__innhold {
-        padding: 0.1rem 0.2rem;
-    }
-    .ekspanderbartPanel__tittel {
-        color: ${theme.color.lenke};
-    }
-    @media print {
-        display: none;
-    }
-`;
-
-function Journalposter(props: { traad: Traad }) {
-    const journalposter = props.traad.journalposter;
-    if (journalposter.isEmpty()) {
-        return null;
-    }
-
-    const content = journalposter.map((journalpost, idx) => {
-        const navn = journalpost.journalfortAv?.navn ?? 'ukjent';
-        const dato = formatterDato(journalpost.journalfortDato);
-        const tema = journalpost.journalfortTemanavn;
-        const saksid = journalpost.journalfortSaksid ? `saksid ${journalpost.journalfortSaksid}` : 'ukjent saksid';
-
-        return <Normaltekst key={idx}>{`${dato}: Journalført på ${tema} (${saksid}) av ${navn}`}</Normaltekst>;
-    });
-
-    return (
-        <StyledJournalforingPanel
-            tittel={<UndertekstBold>Dialogen er journalfort på {journalposter.length} sak(er)</UndertekstBold>}
-            border={false}
-        >
-            {content}
-        </StyledJournalforingPanel>
-    );
-}
-
-function NyTraadVisning(props: Props) {
-    const sisteMelding = nyesteMelding(props.valgtTraad);
-
-    return (
-        <VisningStyle>
-            <Panel>
-                <TopplinjeTittel>{traadstittel(props.valgtTraad)}</TopplinjeTittel>
-                <Topplinje valgtTraad={props.valgtTraad} />
-                <h3 className="sr-only" aria-live="polite">
-                    {traadstittel(props.valgtTraad)} {formatterDatoTid(sisteMelding.opprettetDato)}
-                </h3>
-                <Journalposter traad={props.valgtTraad} />
-            </Panel>
-            <AlleMeldinger sokeord={props.sokeord} traad={props.valgtTraad} />
-        </VisningStyle>
-    );
-}
-
-export default NyTraadVisning;
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/TraadVisning.tsx b/src/app/personside/infotabs/meldinger/traadvisning/TraadVisning.tsx
index e1eb628b4..6c87a40fc 100644
--- a/src/app/personside/infotabs/meldinger/traadvisning/TraadVisning.tsx
+++ b/src/app/personside/infotabs/meldinger/traadvisning/TraadVisning.tsx
@@ -9,13 +9,20 @@ import { setValgtTraadDialogpanel } from '../../../../../redux/oppgave/actions';
 import { useAppState } from '../../../../../utils/customHooks';
 import { AlertStripeInfo } from 'nav-frontend-alertstriper';
 import { Traad } from '../../../../../models/meldinger/meldinger';
-import { eldsteMelding, kanBesvares, meldingstittel, nyesteMelding, saksbehandlerTekst } from '../utils/meldingerUtils';
+import {
+    eldsteMelding,
+    nyesteMelding,
+    saksbehandlerTekst,
+    traadKanBesvares,
+    traadstittel
+} from '../utils/meldingerUtils';
 import { formaterDato } from '../../../../../utils/string-utils';
 import { loggEvent } from '../../../../../utils/logger/frontendLogger';
 import { Printer } from '../../../../../utils/print/usePrinter';
 import Ekspanderbartpanel from 'nav-frontend-ekspanderbartpanel';
-import { Normaltekst, UndertekstBold } from 'nav-frontend-typografi';
+import { Normaltekst, UndertekstBold, Undertittel } from 'nav-frontend-typografi';
 import { useDialogpanelState } from '../../../../../context/dialogpanel-state';
+import Panel from 'nav-frontend-paneler';
 
 interface Props {
     valgtTraad: Traad;
@@ -24,7 +31,6 @@ interface Props {
 }
 
 const VisningStyle = styled.section`
-    padding: ${theme.margin.layout};
     flex-grow: 1;
     > *:last-child {
         margin-top: ${theme.margin.layout};
@@ -37,6 +43,15 @@ const KnappWrapper = styled.div`
     align-items: flex-end;
 `;
 
+const TopplinjeTittel = styled(Undertittel)`
+    margin-bottom: 0.3rem;
+`;
+
+const StyledAlertStripeInfo = styled(AlertStripeInfo)`
+    padding: 0.5rem 0.5rem 0.5rem 0.5rem;
+    margin-bottom: 0.3rem;
+`;
+
 function AlleMeldinger({ traad, sokeord }: { traad: Traad; sokeord: string }) {
     const meldingskomponenter = traad.meldinger
         .sort(datoSynkende((melding) => melding.opprettetDato))
@@ -55,22 +70,24 @@ function Topplinje({ valgtTraad }: { valgtTraad: Traad }) {
     const dialogpanel = useDialogpanelState();
     const dialogpanelTraad = useAppState((state) => state.oppgaver.dialogpanelTraad);
 
-    const traadKanBesvares = kanBesvares(valgtTraad);
+    const kanBesvares = traadKanBesvares(valgtTraad);
     const melding = eldsteMelding(valgtTraad);
 
-    if (melding.markertSomFeilsendtAv || melding.sendtTilSladding || (melding.avsluttetDato && !traadKanBesvares)) {
+    if (melding.markertSomFeilsendtAv || melding.sendtTilSladding || (melding.avsluttetDato && !kanBesvares)) {
         return (
             <>
                 {melding.markertSomFeilsendtAv && (
-                    <AlertStripeInfo>
+                    <StyledAlertStripeInfo>
                         Markert som feilsendt av {saksbehandlerTekst(melding.markertSomFeilsendtAv)}{' '}
                         {melding.ferdigstiltDato && formaterDato(melding.ferdigstiltDato)}
-                    </AlertStripeInfo>
+                    </StyledAlertStripeInfo>
                 )}
                 {melding.sendtTilSladding && (
-                    <AlertStripeInfo>Tråden ligger til behandling for sladding</AlertStripeInfo>
+                    <StyledAlertStripeInfo>Tråden ligger til behandling for sladding</StyledAlertStripeInfo>
+                )}
+                {melding.avsluttetDato && !kanBesvares && (
+                    <StyledAlertStripeInfo>Samtalen er avsluttet av {melding.skrevetAvTekst}</StyledAlertStripeInfo>
                 )}
-                {melding.avsluttetDato && !traadKanBesvares && <AlertStripeInfo>Dialogen er avsluttet</AlertStripeInfo>}
             </>
         );
     }
@@ -82,14 +99,10 @@ function Topplinje({ valgtTraad }: { valgtTraad: Traad }) {
     };
 
     if (dialogpanelTraad?.traadId === valgtTraad.traadId) {
-        return (
-            <KnappWrapper>
-                <AlertStripeInfo>Under arbeid</AlertStripeInfo>
-            </KnappWrapper>
-        );
+        return <StyledAlertStripeInfo>Under arbeid</StyledAlertStripeInfo>;
     }
 
-    if (traadKanBesvares) {
+    if (kanBesvares) {
         return (
             <KnappWrapper>
                 <Hovedknapp onClick={handleNyMelding}>Ny melding</Hovedknapp>
@@ -101,10 +114,10 @@ function Topplinje({ valgtTraad }: { valgtTraad: Traad }) {
 }
 
 const StyledJournalforingPanel = styled(Ekspanderbartpanel)`
-    margin-top: 0.5rem;
+    margin-top: 0.8rem;
     .ekspanderbartPanel__hode,
     .ekspanderbartPanel__innhold {
-        padding: 0.3rem 1rem;
+        padding: 0.1rem 0.2rem;
     }
     .ekspanderbartPanel__tittel {
         color: ${theme.color.lenke};
@@ -144,11 +157,14 @@ function TraadVisning(props: Props) {
 
     return (
         <VisningStyle>
-            <Topplinje valgtTraad={props.valgtTraad} />
-            <h3 className="sr-only" aria-live="polite">
-                {meldingstittel(sisteMelding)} {formatterDatoTid(sisteMelding.opprettetDato)}
-            </h3>
-            <Journalposter traad={props.valgtTraad} />
+            <Panel>
+                <TopplinjeTittel>{traadstittel(props.valgtTraad)}</TopplinjeTittel>
+                <Topplinje valgtTraad={props.valgtTraad} />
+                <h3 className="sr-only" aria-live="polite">
+                    {traadstittel(props.valgtTraad)} {formatterDatoTid(sisteMelding.opprettetDato)}
+                </h3>
+                <Journalposter traad={props.valgtTraad} />
+            </Panel>
             <AlleMeldinger sokeord={props.sokeord} traad={props.valgtTraad} />
         </VisningStyle>
     );
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/TraadVisningWrapper.tsx b/src/app/personside/infotabs/meldinger/traadvisning/TraadVisningWrapper.tsx
index ec0c38897..b3d04b511 100644
--- a/src/app/personside/infotabs/meldinger/traadvisning/TraadVisningWrapper.tsx
+++ b/src/app/personside/infotabs/meldinger/traadvisning/TraadVisningWrapper.tsx
@@ -5,10 +5,6 @@ import * as React from 'react';
 import { Traad } from '../../../../../models/meldinger/meldinger';
 import styled from 'styled-components/macro';
 import usePrinter from '../../../../../utils/print/usePrinter';
-import NyTraadVisning from './NyTraadVisning';
-import IfFeatureToggleOn from '../../../../../components/featureToggle/IfFeatureToggleOn';
-import { FeatureToggles } from '../../../../../components/featureToggle/toggleIDs';
-import IfFeatureToggleOff from '../../../../../components/featureToggle/IfFeatureToggleOff';
 
 interface TraadVisningWrapperProps {
     valgtTraad?: Traad;
@@ -28,12 +24,7 @@ function TraadVisningWrapper(props: TraadVisningWrapperProps) {
     return (
         <StyledArticle key={props.valgtTraad.traadId} role="tabpanel">
             <Verktoylinje valgtTraad={props.valgtTraad} visPrinter={true} />
-            <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                <NyTraadVisning sokeord={props.sokeord} valgtTraad={props.valgtTraad} printer={printer} />
-            </IfFeatureToggleOn>
-            <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                <TraadVisning sokeord={props.sokeord} valgtTraad={props.valgtTraad} printer={printer} />
-            </IfFeatureToggleOff>
+            <TraadVisning sokeord={props.sokeord} valgtTraad={props.valgtTraad} printer={printer} />
         </StyledArticle>
     );
 }
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/__snapshots__/TraadVisningWrapper.test.tsx.snap b/src/app/personside/infotabs/meldinger/traadvisning/__snapshots__/TraadVisningWrapper.test.tsx.snap
index 77a9967c1..b97f044dc 100644
--- a/src/app/personside/infotabs/meldinger/traadvisning/__snapshots__/TraadVisningWrapper.test.tsx.snap
+++ b/src/app/personside/infotabs/meldinger/traadvisning/__snapshots__/TraadVisningWrapper.test.tsx.snap
@@ -7,21 +7,6 @@ exports[`Viser traad med verktøylinje 1`] = `
   padding-top: 1rem;
 }
 
-.c24 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  -webkit-align-items: flex-start;
-  -webkit-box-align: flex-start;
-  -ms-flex-align: flex-start;
-  align-items: flex-start;
-}
-
 .c4 {
   position: relative;
   border: none;
@@ -62,43 +47,55 @@ exports[`Viser traad med verktøylinje 1`] = `
   border-color: #0067c5;
 }
 
-.c22 .snakkeboble-panel {
+.c23 .snakkeboble-panel {
   -webkit-flex-basis: 40rem;
   -ms-flex-preferred-size: 40rem;
   flex-basis: 40rem;
+  padding: 0.5rem 0.5rem 0.3rem;
 }
 
-.c22 a {
+.c23 a {
   word-break: break-word;
 }
 
-.c22 .snakkeboble {
+.c23 .snakkeboble {
   margin: 0;
 }
 
 .c25 {
-  font-weight: 600;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  gap: 0.5rem;
 }
 
-.c23 {
+.c24 {
   text-align: left;
 }
 
-.c23 em {
+.c24 em {
   font-style: normal;
   background-color: #eed28c;
   box-shadow: 0 0 0 0.2rem #eed28c;
   border-radius: 0.625rem;
 }
 
-.c23 > *:not(:last-child) {
-  border-bottom: solid 0.0625rem #b7b1a9;
-  padding-bottom: 0.7rem;
+.c24 > *:not(:last-child) {
   margin-bottom: 0.5rem;
 }
 
-.c26 p {
-  margin-bottom: 0 !important;
+.c26 {
+  font-size: 0.85rem;
+}
+
+.c27 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  gap: 0.3rem;
+  margin-left: auto;
 }
 
 .c18 {
@@ -271,7 +268,6 @@ exports[`Viser traad med verktøylinje 1`] = `
 }
 
 .c19 {
-  padding: .5rem;
   -webkit-box-flex: 1;
   -webkit-flex-grow: 1;
   -ms-flex-positive: 1;
@@ -282,7 +278,7 @@ exports[`Viser traad med verktøylinje 1`] = `
   margin-top: .5rem;
 }
 
-.c20 {
+.c21 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -296,16 +292,20 @@ exports[`Viser traad med verktøylinje 1`] = `
   align-items: flex-end;
 }
 
-.c21 {
-  margin-top: 0.5rem;
+.c20 {
+  margin-bottom: 0.3rem;
 }
 
-.c21 .ekspanderbartPanel__hode,
-.c21 .ekspanderbartPanel__innhold {
-  padding: 0.3rem 1rem;
+.c22 {
+  margin-top: 0.8rem;
 }
 
-.c21 .ekspanderbartPanel__tittel {
+.c22 .ekspanderbartPanel__hode,
+.c22 .ekspanderbartPanel__innhold {
+  padding: 0.1rem 0.2rem;
+}
+
+.c22 .ekspanderbartPanel__tittel {
   color: #0067c5;
 }
 
@@ -320,19 +320,19 @@ exports[`Viser traad med verktøylinje 1`] = `
 }
 
 @media print {
-  .c22 {
+  .c23 {
     page-break-inside: avoid;
     border: solid 0.0625rem #78706a;
     margin-bottom: 2rem;
   }
 
-  .c22 .snakkeboble__snakkeboble-pil-container,
-  .c22 .nav-ikon,
-  .c22 .bruker-ikon {
+  .c23 .snakkeboble__snakkeboble-pil-container,
+  .c23 .nav-ikon,
+  .c23 .bruker-ikon {
     display: none;
   }
 
-  .c22 .snakkeboble-panel {
+  .c23 .snakkeboble-panel {
     -webkit-flex-basis: 100%;
     -ms-flex-preferred-size: 100%;
     flex-basis: 100%;
@@ -352,7 +352,7 @@ exports[`Viser traad med verktøylinje 1`] = `
 }
 
 @media print {
-  .c21 {
+  .c22 {
     display: none;
   }
 }
@@ -1194,73 +1194,82 @@ exports[`Viser traad med verktøylinje 1`] = `
     className="c19"
   >
     <div
-      className="c20"
+      className="panel"
     >
-      <button
-        className="knapp knapp--hoved"
-        disabled={false}
-        onClick={[Function]}
-        type="submit"
+      <h2
+        className="typo-undertittel c20"
       >
-        Ny melding
-      </button>
-    </div>
-    <h3
-      aria-live="polite"
-      className="sr-only"
-    >
-      Spørsmål fra NAV - Arbeid
-       
-      13.08.2019 00:00
-    </h3>
-    <div
-      className="ekspanderbartPanel c21 ekspanderbartPanel--lukket"
-    >
-      <button
-        aria-controls="Helt tilfeldig ID"
-        className="ekspanderbartPanel__hode"
-        id="Helt tilfeldig ID"
-        onClick={[Function]}
-        onKeyDown={[Function]}
-        type="button"
+        Ukjent meldingstype: undefined
+      </h2>
+      <div
+        className="c21"
       >
-        <div
-          className="ekspanderbartPanel__flex-wrapper"
+        <button
+          className="knapp knapp--hoved"
+          disabled={false}
+          onClick={[Function]}
+          type="submit"
         >
-          <span
-            className="ekspanderbartPanel__tittel"
-          >
-            <p
-              className="typo-undertekst-bold"
-            >
-              Dialogen er journalfort på 
-              2
-               sak(er)
-            </p>
-          </span>
-          <span
-            className="ekspanderbartPanel__indikator"
-          />
-        </div>
-      </button>
+          Ny melding
+        </button>
+      </div>
+      <h3
+        aria-live="polite"
+        className="sr-only"
+      >
+        Ukjent meldingstype: undefined
+         
+        13.08.2019 00:00
+      </h3>
       <div
-        aria-labelledby="Helt tilfeldig ID"
-        id="Helt tilfeldig ID"
-        role="region"
+        className="ekspanderbartPanel c22 ekspanderbartPanel--lukket"
       >
-        <div
-          className="ekspanderbartPanel__innhold"
+        <button
+          aria-controls="Helt tilfeldig ID"
+          className="ekspanderbartPanel__hode"
+          id="Helt tilfeldig ID"
+          onClick={[Function]}
+          onKeyDown={[Function]}
+          type="button"
         >
-          <p
-            className="typo-normal"
+          <div
+            className="ekspanderbartPanel__flex-wrapper"
           >
-            30.07.2019: Journalført på Dagpenger (ukjent saksid) av Jenny Berg
-          </p>
-          <p
-            className="typo-normal"
+            <span
+              className="ekspanderbartPanel__tittel"
+            >
+              <p
+                className="typo-undertekst-bold"
+              >
+                Dialogen er journalfort på 
+                2
+                 sak(er)
+              </p>
+            </span>
+            <span
+              className="ekspanderbartPanel__indikator"
+            />
+          </div>
+        </button>
+        <div
+          aria-labelledby="Helt tilfeldig ID"
+          id="Helt tilfeldig ID"
+          role="region"
+        >
+          <div
+            className="ekspanderbartPanel__innhold"
           >
-            28.07.2019: Journalført på Arbeidsavklaringspenger (ukjent saksid) av Jenny Berg
-          </p>
+            <p
+              className="typo-normal"
+            >
+              30.07.2019: Journalført på Dagpenger (ukjent saksid) av Jenny Berg
+            </p>
+            <p
+              className="typo-normal"
+            >
+              28.07.2019: Journalført på Arbeidsavklaringspenger (ukjent saksid) av Jenny Berg
+            </p>
+          </div>
         </div>
       </div>
     </div>
@@ -1268,7 +1277,7 @@ exports[`Viser traad med verktøylinje 1`] = `
       aria-label="Dialog"
     >
       <li
-        className="c22 snakkeboble_ikoner"
+        className="c23 snakkeboble_ikoner"
       >
         <article
           aria-labelledby="Helt tilfeldig ID"
@@ -1293,59 +1302,62 @@ exports[`Viser traad med verktøylinje 1`] = `
                 className="snakkeboble-panel__tekst"
               >
                 <div
-                  className="c23"
+                  className="c24"
                 >
-                  <div
-                    className="Enkeltmelding__Topptekst-sc-1l864g6-2"
-                  >
+                  <div>
+                    <p
+                      className="typo-normal"
+                    >
+                      Dolores omnis ea voluptatem corrupti odit incidunt enim. Unde fugiat sed animi explicabo maiores. Nihil cum accusamus omnis officiis deserunt est. Qui quisquam unde aut magni dignissimos.
+                    </p>
+                  </div>
+                  <div>
                     <div
-                      className="c24"
+                      className="c25"
                     >
-                      <h4
-                        id="Helt tilfeldig ID"
+                      <p
+                        className="c26"
                       >
-                        <span
-                          className="sr-only"
-                        >
-                          Melding 
-                          4
-                        </span>
-                        <div
-                          className="c25"
-                        >
-                          Spørsmål fra NAV - Arbeid
-                        </div>
-                      </h4>
+                        27.07.2019 00:00
+                      </p>
+                      <p
+                        className="c26"
+                      >
+                        Skrevet av Kristoffer Fredriksen (xy70r8)
+                      </p>
                       <div
-                        className="etikett etikett--suksess"
+                        className="c27"
                       >
-                        <span
-                          className="typo-normal"
+                        <p
+                          className="c26"
+                        >
+                          Lest: 23.07.2019 00:00
+                        </p>
+                        <svg
+                          aria-hidden="true"
+                          aria-labelledby="title-id"
+                          fill="none"
+                          focusable="false"
+                          height="20"
+                          role="img"
+                          viewBox="0 0 24 24"
+                          width="20"
+                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          Lest
-                        </span>
+                          <title
+                            id="title-id"
+                          >
+                            Melding lest
+                          </title>
+                          <path
+                            clipRule="evenodd"
+                            d="M0.210623 7.51518L10.4732 13.0282L10.4789 13.0312L10.4789 13.0312L12 13.8609L13.5211 13.0312L13.5268 13.0281L13.5268 13.0282L23.7894 7.51518L12 1L0.210623 7.51518ZM24 9.67234L15.9314 14.0067L24 19.4557V9.67234ZM23.3783 21.4492L13.9446 15.0784L12.4789 15.8779L12 16.1391L11.5211 15.8779L10.0554 15.0784L0.621651 21.4492C0.980399 21.7905 1.46574 22 2 22H22C22.5343 22 23.0196 21.7905 23.3783 21.4492ZM0 19.4557L8.06862 14.0067L0 9.67234V19.4557Z"
+                            fill="#33aa5f"
+                            fillRule="evenodd"
+                          />
+                        </svg>
                       </div>
                     </div>
-                    <div>
-                      27.07.2019 00:00
-                    </div>
-                    <p
-                      className="typo-normal"
-                    >
-                      Melding lest: 23.07.2019 00:00
-                    </p>
-                    <div
-                      className="c26 typo-normal"
-                    >
-                      Skrevet av Kristoffer Fredriksen (xy70r8)
-                    </div>
-                  </div>
-                  <div>
-                    <p
-                      className="typo-normal"
-                    >
-                      Dolores omnis ea voluptatem corrupti odit incidunt enim. Unde fugiat sed animi explicabo maiores. Nihil cum accusamus omnis officiis deserunt est. Qui quisquam unde aut magni dignissimos.
-                    </p>
                   </div>
                 </div>
               </div>
@@ -1354,7 +1366,7 @@ exports[`Viser traad med verktøylinje 1`] = `
         </article>
       </li>
       <li
-        className="c22 snakkeboble_ikoner"
+        className="c23 snakkeboble_ikoner"
       >
         <article
           aria-labelledby="Helt tilfeldig ID"
@@ -1379,34 +1391,8 @@ exports[`Viser traad med verktøylinje 1`] = `
                 className="snakkeboble-panel__tekst"
               >
                 <div
-                  className="c23"
+                  className="c24"
                 >
-                  <div
-                    className="Enkeltmelding__Topptekst-sc-1l864g6-2"
-                  >
-                    <div
-                      className="c24"
-                    >
-                      <h4
-                        id="Helt tilfeldig ID"
-                      >
-                        <span
-                          className="sr-only"
-                        >
-                          Melding 
-                          3
-                        </span>
-                        <div
-                          className="c25"
-                        >
-                          Spørsmål fra bruker - Helse
-                        </div>
-                      </h4>
-                    </div>
-                    <div>
-                      16.07.2019 00:00
-                    </div>
-                  </div>
                   <div>
                     <p
                       className="typo-normal"
@@ -1414,6 +1400,20 @@ exports[`Viser traad med verktøylinje 1`] = `
                       Quo magni eaque et libero minima ipsum amet et dolorem. Sed iusto ratione sit. Voluptate alias qui impedit ut dolorum doloribus qui. Qui beatae rerum minima suscipit.
                     </p>
                   </div>
+                  <div>
+                    <div
+                      className="c25"
+                    >
+                      <p
+                        className="c26"
+                      >
+                        16.07.2019 00:00
+                      </p>
+                      <div
+                        className="c27"
+                      />
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -1421,7 +1421,7 @@ exports[`Viser traad med verktøylinje 1`] = `
         </article>
       </li>
       <li
-        className="c22 snakkeboble_ikoner"
+        className="c23 snakkeboble_ikoner"
       >
         <article
           aria-labelledby="Helt tilfeldig ID"
@@ -1446,34 +1446,8 @@ exports[`Viser traad med verktøylinje 1`] = `
                 className="snakkeboble-panel__tekst"
               >
                 <div
-                  className="c23"
+                  className="c24"
                 >
-                  <div
-                    className="Enkeltmelding__Topptekst-sc-1l864g6-2"
-                  >
-                    <div
-                      className="c24"
-                    >
-                      <h4
-                        id="Helt tilfeldig ID"
-                      >
-                        <span
-                          className="sr-only"
-                        >
-                          Melding 
-                          2
-                        </span>
-                        <div
-                          className="c25"
-                        >
-                          Spørsmål fra bruker - Arbeid
-                        </div>
-                      </h4>
-                    </div>
-                    <div>
-                      12.07.2019 00:00
-                    </div>
-                  </div>
                   <div>
                     <p
                       className="typo-normal"
@@ -1481,6 +1455,20 @@ exports[`Viser traad med verktøylinje 1`] = `
                       Animi qui molestiae omnis reiciendis quam in. Provident magnam dolor. Omnis voluptatem placeat labore in ut aliquam perspiciatis fugiat. Perspiciatis voluptatum odit.
                     </p>
                   </div>
+                  <div>
+                    <div
+                      className="c25"
+                    >
+                      <p
+                        className="c26"
+                      >
+                        12.07.2019 00:00
+                      </p>
+                      <div
+                        className="c27"
+                      />
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -1488,7 +1476,7 @@ exports[`Viser traad med verktøylinje 1`] = `
         </article>
       </li>
       <li
-        className="c22 snakkeboble_ikoner"
+        className="c23 snakkeboble_ikoner"
       >
         <article
           aria-labelledby="Helt tilfeldig ID"
@@ -1513,59 +1501,62 @@ exports[`Viser traad med verktøylinje 1`] = `
                 className="snakkeboble-panel__tekst"
               >
                 <div
-                  className="c23"
+                  className="c24"
                 >
-                  <div
-                    className="Enkeltmelding__Topptekst-sc-1l864g6-2"
-                  >
+                  <div>
+                    <p
+                      className="typo-normal"
+                    >
+                      Ea laborum accusamus et ex voluptates provident eveniet voluptatem. Sunt et sed eligendi harum exercitationem. Eaque est maiores autem sunt occaecati atque ipsa ea itaque. Dolorum enim quaerat alias ut sit labore pariatur.
+                    </p>
+                  </div>
+                  <div>
                     <div
-                      className="c24"
+                      className="c25"
                     >
-                      <h4
-                        id="Helt tilfeldig ID"
+                      <p
+                        className="c26"
                       >
-                        <span
-                          className="sr-only"
-                        >
-                          Melding 
-                          1
-                        </span>
-                        <div
-                          className="c25"
-                        >
-                          Samtalereferat oppmøte - Arbeid
-                        </div>
-                      </h4>
+                        07.07.2019 00:00
+                      </p>
+                      <p
+                        className="c26"
+                      >
+                        Skrevet av Sander Hansen (nzxo4q)
+                      </p>
                       <div
-                        className="etikett etikett--suksess"
+                        className="c27"
                       >
-                        <span
-                          className="typo-normal"
+                        <p
+                          className="c26"
+                        >
+                          Lest: 12.07.2019 00:00
+                        </p>
+                        <svg
+                          aria-hidden="true"
+                          aria-labelledby="title-id"
+                          fill="none"
+                          focusable="false"
+                          height="20"
+                          role="img"
+                          viewBox="0 0 24 24"
+                          width="20"
+                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          Lest
-                        </span>
+                          <title
+                            id="title-id"
+                          >
+                            Melding lest
+                          </title>
+                          <path
+                            clipRule="evenodd"
+                            d="M0.210623 7.51518L10.4732 13.0282L10.4789 13.0312L10.4789 13.0312L12 13.8609L13.5211 13.0312L13.5268 13.0281L13.5268 13.0282L23.7894 7.51518L12 1L0.210623 7.51518ZM24 9.67234L15.9314 14.0067L24 19.4557V9.67234ZM23.3783 21.4492L13.9446 15.0784L12.4789 15.8779L12 16.1391L11.5211 15.8779L10.0554 15.0784L0.621651 21.4492C0.980399 21.7905 1.46574 22 2 22H22C22.5343 22 23.0196 21.7905 23.3783 21.4492ZM0 19.4557L8.06862 14.0067L0 9.67234V19.4557Z"
+                            fill="#33aa5f"
+                            fillRule="evenodd"
+                          />
+                        </svg>
                       </div>
                     </div>
-                    <div>
-                      07.07.2019 00:00
-                    </div>
-                    <p
-                      className="typo-normal"
-                    >
-                      Melding lest: 12.07.2019 00:00
-                    </p>
-                    <div
-                      className="c26 typo-normal"
-                    >
-                      Skrevet av Sander Hansen (nzxo4q)
-                    </div>
-                  </div>
-                  <div>
-                    <p
-                      className="typo-normal"
-                    >
-                      Ea laborum accusamus et ex voluptates provident eveniet voluptatem. Sunt et sed eligendi harum exercitationem. Eaque est maiores autem sunt occaecati atque ipsa ea itaque. Dolorum enim quaerat alias ut sit labore pariatur.
-                    </p>
                   </div>
                 </div>
               </div>
diff --git a/src/app/personside/infotabs/meldinger/traadvisning/verktoylinje/merk/sladdevalg/SladdMeldingerMedArsak.tsx b/src/app/personside/infotabs/meldinger/traadvisning/verktoylinje/merk/sladdevalg/SladdMeldingerMedArsak.tsx
index 267435fc3..760fbb458 100644
--- a/src/app/personside/infotabs/meldinger/traadvisning/verktoylinje/merk/sladdevalg/SladdMeldingerMedArsak.tsx
+++ b/src/app/personside/infotabs/meldinger/traadvisning/verktoylinje/merk/sladdevalg/SladdMeldingerMedArsak.tsx
@@ -15,10 +15,6 @@ import { feilmeldingReactHookForm } from '../../oppgave/feilmeldingReactHookForm
 import { guid } from 'nav-frontend-js-utils';
 import MeldIPortenAdvarsel from './MeldIPortenAdvarsel';
 import FormSelect from '../../../../../../../../components/form/FormSelect';
-import NyEnkeltMelding from '../../../NyEnkeltmelding';
-import IfFeatureToggleOn from '../../../../../../../../components/featureToggle/IfFeatureToggleOn';
-import { FeatureToggles } from '../../../../../../../../components/featureToggle/toggleIDs';
-import IfFeatureToggleOff from '../../../../../../../../components/featureToggle/IfFeatureToggleOff';
 
 const PreviewStyle = styled(Normaltekst)`
     width: 100%;
@@ -41,24 +37,12 @@ function ValgteMeldingerPreview(props: { traad: Traad; valgte: string[] }) {
             .map((melding, index) => {
                 const meldingnummer = props.traad.meldinger.length - index;
                 return (
-                    <>
-                        <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                            <NyEnkeltMelding
-                                sokeord=""
-                                melding={melding}
-                                key={melding.meldingsId}
-                                meldingsNummer={meldingnummer}
-                            />
-                        </IfFeatureToggleOn>
-                        <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                            <EnkeltMelding
-                                sokeord=""
-                                melding={melding}
-                                key={melding.meldingsId}
-                                meldingsNummer={meldingnummer}
-                            />
-                        </IfFeatureToggleOff>
-                    </>
+                    <EnkeltMelding
+                        sokeord=""
+                        melding={melding}
+                        key={melding.meldingsId}
+                        meldingsNummer={meldingnummer}
+                    />
                 );
             });
 
diff --git a/src/app/personside/infotabs/oversikt/MeldingerOversikt.tsx b/src/app/personside/infotabs/oversikt/MeldingerOversikt.tsx
index d4cf93f0d..6a0850b93 100644
--- a/src/app/personside/infotabs/oversikt/MeldingerOversikt.tsx
+++ b/src/app/personside/infotabs/oversikt/MeldingerOversikt.tsx
@@ -16,10 +16,6 @@ import { useOnMount } from '../../../../utils/customHooks';
 import { temagruppeTekst } from '../../../../models/temagrupper';
 import TraadSammendrag from '../meldinger/traadliste/TraadSammendrag';
 import dialogResource from '../../../../rest/resources/dialogResource';
-import IfFeatureToggleOn from '../../../../components/featureToggle/IfFeatureToggleOn';
-import { FeatureToggles } from '../../../../components/featureToggle/toggleIDs';
-import NyTraadSammendrag from '../meldinger/traadliste/NyTraadSammendrag';
-import IfFeatureToggleOff from '../../../../components/featureToggle/IfFeatureToggleOff';
 
 const ListStyle = styled.ol`
     > *:not(:first-child) {
@@ -72,12 +68,7 @@ function Traadelement(props: { traad: Traad }) {
                 ariaDescription={'Vis meldinger for ' + tittel}
                 className={meldingerTest.oversikt}
             >
-                <IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
-                    <NyTraadSammendrag traad={props.traad} />
-                </IfFeatureToggleOn>
-                <IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
-                    <TraadSammendrag traad={props.traad} />
-                </IfFeatureToggleOff>
+                <TraadSammendrag traad={props.traad} />
             </VisMerKnapp>
         </li>
     );
diff --git a/src/app/personside/infotabs/oversikt/Oversikt.tsx b/src/app/personside/infotabs/oversikt/Oversikt.tsx
index 720b96bce..a5848f0f9 100644
--- a/src/app/personside/infotabs/oversikt/Oversikt.tsx
+++ b/src/app/personside/infotabs/oversikt/Oversikt.tsx
@@ -65,7 +65,7 @@ function Oversikt() {
                 <KolonneStyle>
                     <Oversiktskomponent
                         infotabPath={INFOTABS.MELDINGER}
-                        tittel={'Meldinger'}
+                        tittel={'Kommunikasjon'}
                         component={MeldingerOversikt}
                         hurtigtast={'M'}
                     />
diff --git a/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap b/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap
index 9aca748d0..2d06c6fdb 100644
--- a/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap
+++ b/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap
@@ -907,7 +907,7 @@ exports[`Viser oversikt med alt innhold 1`] = `
             className="typo-undertittel"
             id="Helt tilfeldig ID"
           >
-            Meldinger
+            Kommunikasjon
           </h3>
           <div
             className="c4"
@@ -921,7 +921,7 @@ exports[`Viser oversikt med alt innhold 1`] = `
               className="typo-normal"
             >
               Gå til 
-              meldinger
+              kommunikasjon
             </p>
           </a>
         </div>
@@ -982,7 +982,7 @@ exports[`Viser oversikt med alt innhold 1`] = `
                         <p
                           className="typo-element order-second"
                         >
-                          Spørsmål fra NAV - Arbeid
+                          Ukjent meldingstype: undefined
                         </p>
                         <p
                           className="typo-normal order-first"
diff --git a/src/app/personside/infotabs/utbetalinger/filter/EgendefinertDatoInputs.tsx b/src/app/personside/infotabs/utbetalinger/filter/EgendefinertDatoInputs.tsx
index c0e3d3dc9..ed13a95e3 100644
--- a/src/app/personside/infotabs/utbetalinger/filter/EgendefinertDatoInputs.tsx
+++ b/src/app/personside/infotabs/utbetalinger/filter/EgendefinertDatoInputs.tsx
@@ -25,9 +25,7 @@ function onDatoChange(props: Props, dato: Partial<Periode>) {
     });
 }
 
-const tidligsteDato = dayjs()
-    .subtract(5, 'years')
-    .startOf('year');
+const tidligsteDato = dayjs().subtract(3, 'years').startOf('year');
 const senesteDato: Dayjs = dayjs();
 
 const isoTidligsteDato = tidligsteDato.format(ISO_DATE_STRING_FORMAT);
@@ -69,8 +67,9 @@ const periodeValidering = [
 function getDatoFeilmelding(fra: string, til: string) {
     const fraDato = dayjs(fra, ISO_DATE_STRING_FORMAT);
     const tilDato = dayjs(til, ISO_DATE_STRING_FORMAT);
-    const feilmelding: string | undefined = periodeValidering.find(validering => validering.erUgyldig(fraDato, tilDato))
-        ?.feilmelding;
+    const feilmelding: string | undefined = periodeValidering.find((validering) =>
+        validering.erUgyldig(fraDato, tilDato)
+    )?.feilmelding;
     if (feilmelding) {
         return <SkjemaelementFeilmelding>{feilmelding}</SkjemaelementFeilmelding>;
     }
@@ -93,7 +92,7 @@ function EgendefinertDatoInputs(props: Props) {
                 locale={'nb'}
                 inputId="utbetalinger-datovelger-fra"
                 value={fra}
-                onChange={dato => onDatoChange(props, { fra: dato })}
+                onChange={(dato) => onDatoChange(props, { fra: dato })}
                 inputProps={{
                     name: 'Fra dato',
                     'aria-invalid': fra !== '' && isISODateString(fra) === false
@@ -113,7 +112,7 @@ function EgendefinertDatoInputs(props: Props) {
                 locale={'nb'}
                 inputId="utbetalinger-datovelger-til"
                 value={til}
-                onChange={dato => onDatoChange(props, { til: dato })}
+                onChange={(dato) => onDatoChange(props, { til: dato })}
                 inputProps={{
                     name: 'Til dato',
                     'aria-invalid': til !== '' && isISODateString(til) === false
diff --git a/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBody.test.tsx.snap b/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBody.test.tsx.snap
index ced87429b..de7424ebc 100644
--- a/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBody.test.tsx.snap
+++ b/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBody.test.tsx.snap
@@ -1676,7 +1676,7 @@ exports[`viser info om bruker i visittkortbody 1`] = `
     >
       <a
         className="lenke"
-        href="https://pdl-web.dev.intern.nav.no/?aktoerId=00010108000398000"
+        href="https://pdl-web.intern.dev.nav.no/?aktoerId=00010108000398000"
         rel="noreferrer noopener"
         target="_blank"
       >
diff --git a/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBodyFeilendeSystemer.test.tsx.snap b/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBodyFeilendeSystemer.test.tsx.snap
index 35014a258..1e7f3bb32 100644
--- a/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBodyFeilendeSystemer.test.tsx.snap
+++ b/src/app/personside/visittkort-v2/body/__snapshots__/VisittkortBodyFeilendeSystemer.test.tsx.snap
@@ -1479,7 +1479,7 @@ exports[`viser info om bruker i visittkortbody 1`] = `
     >
       <a
         className="lenke"
-        href="https://pdl-web.dev.intern.nav.no/?aktoerId=00010108000398000"
+        href="https://pdl-web.intern.dev.nav.no/?aktoerId=00010108000398000"
         rel="noreferrer noopener"
         target="_blank"
       >
diff --git a/src/mock/baseUrls-mock.ts b/src/mock/baseUrls-mock.ts
index 21d8b77cd..f09f3ee51 100644
--- a/src/mock/baseUrls-mock.ts
+++ b/src/mock/baseUrls-mock.ts
@@ -3,7 +3,7 @@ import { BaseUrls } from '../models/baseurls';
 export function mockBaseUrls(): BaseUrls {
     return {
         norg2Frontend: 'https://norg2-frontend.nais.preprod.local',
-        personforvalter: 'https://pdl-web.dev.intern.nav.no/',
+        personforvalter: 'https://pdl-web.intern.dev.nav.no/',
         drek: 'https://drek.nais.preprod.local/'
     };
 }
diff --git a/src/svg/ReadIcon.tsx b/src/svg/ReadIcon.tsx
index 4a4747b63..1f43ae949 100644
--- a/src/svg/ReadIcon.tsx
+++ b/src/svg/ReadIcon.tsx
@@ -15,8 +15,8 @@ function ReadIcon() {
         >
             <title id="title-id">Melding lest</title>
             <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
+                fillRule="evenodd"
+                clipRule="evenodd"
                 d="M0.210623 7.51518L10.4732 13.0282L10.4789 13.0312L10.4789 13.0312L12 13.8609L13.5211 13.0312L13.5268 13.0281L13.5268 13.0282L23.7894 7.51518L12 1L0.210623 7.51518ZM24 9.67234L15.9314 14.0067L24 19.4557V9.67234ZM23.3783 21.4492L13.9446 15.0784L12.4789 15.8779L12 16.1391L11.5211 15.8779L10.0554 15.0784L0.621651 21.4492C0.980399 21.7905 1.46574 22 2 22H22C22.5343 22 23.0196 21.7905 23.3783 21.4492ZM0 19.4557L8.06862 14.0067L0 9.67234V19.4557Z"
                 fill="#33aa5f"
             />