diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index 327e9e5b83b..a411eea9eb5 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -70,6 +70,26 @@
         </div>
     </div>
     <app-send-add-edit *ngIf="action == 'add' || action == 'edit'"></app-send-add-edit>
+    <div id="view" class="details" *ngIf="action == 'view'">
+        <div class="content">
+            <div class="inner-content">
+                <div class="box">
+                    <div class="box-header">
+                        {{'sendInformation' | i18n}}
+                    </div>
+                    <div class="box-content">
+                        <div class="box-content-row">
+                            <span class="row-label">{{'name' | i18n}}</span>
+                            {{selectedSend.name}}
+                        </div>
+                        <!-- Login -->
+                        <div *ngIf="cipher.login">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="logo" *ngIf="!action">
         <div class="content">
             <div class="inner-content">
diff --git a/src/app/send/send.component.ts b/src/app/send/send.component.ts
index 49f54937d1f..25fdf141f18 100644
--- a/src/app/send/send.component.ts
+++ b/src/app/send/send.component.ts
@@ -20,7 +20,6 @@ import { SendComponent as BaseSendComponent } from 'jslib/angular/components/sen
 
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
 
-import { SendType } from 'jslib/enums/sendType';
 import { SendView } from 'jslib/models/view/sendView';
 
 enum Action {
@@ -38,6 +37,7 @@ export class SendComponent extends BaseSendComponent implements OnInit {
     sendId: string;
     modal: ModalComponent = null;
     action: Action = Action.None;
+    selectedSend: SendView;
 
     constructor(sendService: SendService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
@@ -52,39 +52,21 @@ export class SendComponent extends BaseSendComponent implements OnInit {
         this.sends = await this.sendService.getAllDecrypted();
 
         this.route.queryParams.subscribe(async (params) => {
-            if (params == null) {
-                this.selectedAll = true;
-                await this.reload();
-            } else {
-                const sendView = new SendView();
-                if (params.sendId) {
-                    sendView.id = params.sendId;
-                    if (params.action === 'edit') {
-                        this.editSend(sendView);
-                    } else if (params.action === 'view') {
-                        // TODO: this
-                        // this.viewSend(sendView);
-                    }
-                } else if (params.action === 'add') {
-                    this.addSend();
-                } else {
-                    if (params.files) {
-                        sendView.type = SendType.File;
-                        this.filter = (s) => {
-                            return filter(s) && s.text != null;
-                        };
-                        this.filter(sendView);
-                    } else if (params.text) {
-                        sendView.type = SendType.Text;
-                        this.filter = (s) => {
-                            return filter(s) && s.file != null;
-                        };
-                        this.filter(sendView);
-                    } else {
-                        this.selectAll();
-                    }
-                }
+            this.sendId = params.sendId;
+            if (this.sendId != null) {
+                this.selectedSend = this.sends.find((s) => s.id === params.sendId);
+                params.action === 'edit' ?
+                    this.action = Action.Edit :
+                    this.action = Action.View;
+                return;
             }
+
+            if (params.action === 'add') {
+                this.action = Action.Add;
+                return;
+            }
+
+            this.selectAll();
         });
 
         this.loading = false;
@@ -102,10 +84,11 @@ export class SendComponent extends BaseSendComponent implements OnInit {
     }
 
     editSend(send: SendView) {
-        if (this.action === Action.Edit && this.sendId === send.id) {
-            return;
-        }
-        this.action = Action.Edit;
+        return;
+    }
+
+    selectSend(send: SendView) {
+        this.action = Action.View;
         this.sendId = send.id;
         this.go();
     }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 3228bd89118..af729b7b9d1 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1510,5 +1510,8 @@
   "searchSends": {
     "message": "Search Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendInformation": {
+    "message": "Send Information"
   }
 }