diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 087a89e4..591f2991 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -40,7 +40,6 @@ import { SettingsComponent } from './components/floating-column/settings/setting
 import { AddNewAccountComponent } from './components/floating-column/add-new-account/add-new-account.component';
 import { SearchComponent } from './components/floating-column/search/search.component';
 import { AddNewStatusComponent } from "./components/floating-column/add-new-status/add-new-status.component";
-import { EditStatusComponent } from "./components/floating-column/edit-status/edit-status.component";
 import { ManageAccountComponent } from "./components/floating-column/manage-account/manage-account.component";
 import { ActionBarComponent } from './components/stream/status/action-bar/action-bar.component';
 import { WaitingAnimationComponent } from './components/waiting-animation/waiting-animation.component';
@@ -112,7 +111,6 @@ const routes: Routes = [
         FloatingColumnComponent,
         ManageAccountComponent,
         AddNewStatusComponent,
-        EditStatusComponent,
         AttachementsComponent,
         SettingsComponent,
         AddNewAccountComponent,
diff --git a/src/app/components/floating-column/edit-status/edit-status.component.html b/src/app/components/floating-column/edit-status/edit-status.component.html
deleted file mode 100644
index a14534ce..00000000
--- a/src/app/components/floating-column/edit-status/edit-status.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="panel">
-    <h3 class="panel__title">edit message</h3>
-
-    <div class=" new-message-body flexcroll">
-        <app-create-status (onClose)="closeColumn()" [isDirectMention]="isDirectMention"
-            [replyingUserHandle]="userHandle" [statusToEdit]="statusToEdit"></app-create-status>
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/components/floating-column/edit-status/edit-status.component.scss b/src/app/components/floating-column/edit-status/edit-status.component.scss
deleted file mode 100644
index b86a13ca..00000000
--- a/src/app/components/floating-column/edit-status/edit-status.component.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-@import "variables";
-@import "panel";
-@import "buttons";
-@import "commons";
-
-$btn-send-status-width: 60px;
-
-.form-control { 
-    margin-bottom: 5px;
-
-    &--privacy{
-        display: inline-block; 
-        width: calc(100% - 5px - #{$btn-send-status-width});
-    }
-}
-
-.btn-custom-primary {
-    display: inline-block;
-    width: $btn-send-status-width;
-    position: relative;
-    top: -1px;
-    left: 5px;
-    font-weight: 500;
-}
-
-.panel {
-    padding-left: 0;
-    padding-right: 0;    
-}
-
-.new-message-body {
-    overflow: auto;
-    height: calc(100% - 30px);
-    padding-right: 5px;
-    
-    padding-bottom: 100px;    
-}
diff --git a/src/app/components/floating-column/edit-status/edit-status.component.spec.ts b/src/app/components/floating-column/edit-status/edit-status.component.spec.ts
deleted file mode 100644
index 9ac902b6..00000000
--- a/src/app/components/floating-column/edit-status/edit-status.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { EditStatusComponent } from '../edit-status/edit-status.component';
-
-
-xdescribe('EditStatusComponent', () => {
-  let component: EditStatusComponent;
-  let fixture: ComponentFixture<EditStatusComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ EditStatusComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditStatusComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/components/floating-column/edit-status/edit-status.component.ts b/src/app/components/floating-column/edit-status/edit-status.component.ts
deleted file mode 100644
index 300c7c6f..00000000
--- a/src/app/components/floating-column/edit-status/edit-status.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-
-import { NavigationService } from '../../../services/navigation.service';
-import { StatusWrapper } from '../../../models/common.model';
-
-@Component({
-    selector: 'app-edit-status',
-    templateUrl: './edit-status.component.html',
-    styleUrls: ['./edit-status.component.scss']
-})
-export class EditStatusComponent implements OnInit {
-
-    @Input() isDirectMention: boolean;
-    @Input() userHandle: string;
-    @Input() statusToEdit: StatusWrapper;
-
-    constructor(private readonly navigationService: NavigationService) {
-    }
-
-    ngOnInit() {
-    }
-
-    closeColumn() {
-        this.navigationService.closePanel();
-    }
-}