diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 63b1fa1e..6cedda9c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -70,6 +70,7 @@ import { EmojiPickerComponent } from './components/create-status/emoji-picker/em
 import { StatusUserContextMenuComponent } from './components/stream/status/action-bar/status-user-context-menu/status-user-context-menu.component';
 import { StatusSchedulerComponent } from './components/create-status/status-scheduler/status-scheduler.component';
 import { PollEditorComponent } from './components/create-status/poll-editor/poll-editor.component';
+import { PollEntryComponent } from './components/create-status/poll-editor/poll-entry/poll-entry.component';
 
 
 const routes: Routes = [
@@ -126,7 +127,8 @@ const routes: Routes = [
         EmojiPickerComponent,
         StatusUserContextMenuComponent,
         StatusSchedulerComponent,
-        PollEditorComponent
+        PollEditorComponent,
+        PollEntryComponent
     ],
     entryComponents: [
         EmojiPickerComponent
diff --git a/src/app/components/create-status/create-status.component.html b/src/app/components/create-status/create-status.component.html
index 98c5e8ab..30b2c0e7 100644
--- a/src/app/components/create-status/create-status.component.html
+++ b/src/app/components/create-status/create-status.component.html
@@ -27,11 +27,13 @@
 
     <div class="status-editor__footer" #footer>
         <button type="submit" title="reply" class="status-editor__footer--send-button" *ngIf="statusReplyingToWrapper">
-            <span *ngIf="!isSending">REPLY!</span>
+            <span *ngIf="!isSending && !scheduleIsActive">REPLY!</span>
+            <span *ngIf="!isSending && scheduleIsActive">SAVE!</span>
             <app-waiting-animation class="waiting-icon" *ngIf="isSending"></app-waiting-animation>
         </button>
         <button type="submit" title="post" class="status-editor__footer--send-button" *ngIf="!statusReplyingToWrapper">
-            <span *ngIf="!isSending">POST!</span>
+            <span *ngIf="!isSending && !scheduleIsActive">POST!</span>
+            <span *ngIf="!isSending && scheduleIsActive">SAVE!</span>
             <app-waiting-animation class="waiting-icon" *ngIf="isSending"></app-waiting-animation>
         </button>
         <div class="status-editor__footer__counter">
diff --git a/src/app/components/create-status/poll-editor/poll-editor.component.html b/src/app/components/create-status/poll-editor/poll-editor.component.html
index b092ec89..58a6fed9 100644
--- a/src/app/components/create-status/poll-editor/poll-editor.component.html
+++ b/src/app/components/create-status/poll-editor/poll-editor.component.html
@@ -1,3 +1,15 @@
-<p>
-  poll-editor works!
-</p>
+<div class="poll-editor">
+    <div *ngFor="let e of entries">
+        <app-poll-entry class="poll-editor__entry" [entry]="e"></app-poll-entry>
+    </div>
+
+    <div class="poll-editor__footer">
+        <a href (click)="addEntry()">
+            Add entry
+        </a>
+
+        <select [(ngModel)]="selectedId">
+            <option *ngFor="let d of delayChoice" [ngValue]="d.id">{{d.label}}</option>
+        </select>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/create-status/poll-editor/poll-editor.component.scss b/src/app/components/create-status/poll-editor/poll-editor.component.scss
index e69de29b..ea10bb2e 100644
--- a/src/app/components/create-status/poll-editor/poll-editor.component.scss
+++ b/src/app/components/create-status/poll-editor/poll-editor.component.scss
@@ -0,0 +1,17 @@
+@import "variables";
+
+.poll-editor {
+    background-color: $poll-editor-background;
+    border-top: 1px solid $poll-editor-separator;
+    min-height: 30px;
+    margin: 0 5px;
+
+    &__entry {
+        display: block;
+    }
+
+    &__footer {
+        border-top: 1px solid $poll-editor-separator;
+        min-height: 30px;
+    }
+}
\ No newline at end of file
diff --git a/src/app/components/create-status/poll-editor/poll-editor.component.ts b/src/app/components/create-status/poll-editor/poll-editor.component.ts
index a7edb132..7e9c5c58 100644
--- a/src/app/components/create-status/poll-editor/poll-editor.component.ts
+++ b/src/app/components/create-status/poll-editor/poll-editor.component.ts
@@ -1,15 +1,49 @@
 import { Component, OnInit } from '@angular/core';
 
+import { PollEntry } from './poll-entry/poll-entry.component';
+
 @Component({
-  selector: 'app-poll-editor',
-  templateUrl: './poll-editor.component.html',
-  styleUrls: ['./poll-editor.component.scss']
+    selector: 'app-poll-editor',
+    templateUrl: './poll-editor.component.html',
+    styleUrls: ['./poll-editor.component.scss']
 })
 export class PollEditorComponent implements OnInit {
 
-  constructor() { }
+    entries: PollEntry[] = [];
+    delayChoice: Delay[] = [];
+    selectedId: string;
 
-  ngOnInit() {
-  }
+    constructor() {
+        this.entries.push(new PollEntry());
+        this.entries.push(new PollEntry());
 
+        this.delayChoice.push(new Delay(60 * 5, "5 minutes"));
+        this.delayChoice.push(new Delay(60 * 30, "30 minutes"));
+        this.delayChoice.push(new Delay(60 * 60, "1 hour"));
+        this.delayChoice.push(new Delay(60 * 60 * 6, "6 hours"));
+        this.delayChoice.push(new Delay(60 * 60 * 24, "1 day"));
+        this.delayChoice.push(new Delay(60 * 60 * 24 * 3, "3 days"));
+        this.delayChoice.push(new Delay(60 * 60 * 24 * 7, "7 days"));
+        this.delayChoice.push(new Delay(60 * 60 * 24 * 15, "15 days"));
+        this.delayChoice.push(new Delay(60 * 60 * 24 * 30, "30 days"));
+
+        this.selectedId = this.delayChoice[4].id;
+    }
+
+    ngOnInit() {
+
+    }
+
+    addEntry(): boolean {
+        this.entries.push(new PollEntry());
+        return false;
+    }
 }
+
+class Delay {
+    constructor(public delayInSeconds: number, public label: string) {
+        this.id = delayInSeconds.toString();
+    }
+
+    id: string;
+}
\ No newline at end of file
diff --git a/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.html b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.html
new file mode 100644
index 00000000..cac80cb6
--- /dev/null
+++ b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.html
@@ -0,0 +1,3 @@
+<p>
+  poll-entry works!
+</p>
diff --git a/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.scss b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.spec.ts b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.spec.ts
new file mode 100644
index 00000000..bc126a30
--- /dev/null
+++ b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PollEntryComponent } from './poll-entry.component';
+
+describe('PollEntryComponent', () => {
+  let component: PollEntryComponent;
+  let fixture: ComponentFixture<PollEntryComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PollEntryComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PollEntryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.ts b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.ts
new file mode 100644
index 00000000..1be7168b
--- /dev/null
+++ b/src/app/components/create-status/poll-editor/poll-entry/poll-entry.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+    selector: 'app-poll-entry',
+    templateUrl: './poll-entry.component.html',
+    styleUrls: ['./poll-entry.component.scss']
+})
+export class PollEntryComponent implements OnInit {
+    @Input() entry: PollEntry;
+
+    constructor() { }
+
+    ngOnInit() {
+    }
+
+    remove(): boolean { 
+        
+        return false;
+    }
+
+}
+
+export class PollEntry {
+    public isMulti: boolean;
+    public entry: string;
+}
\ No newline at end of file
diff --git a/src/app/components/create-status/status-scheduler/status-scheduler.component.html b/src/app/components/create-status/status-scheduler/status-scheduler.component.html
index f7760d48..b0100e32 100644
--- a/src/app/components/create-status/status-scheduler/status-scheduler.component.html
+++ b/src/app/components/create-status/status-scheduler/status-scheduler.component.html
@@ -1,3 +1,3 @@
-<p>
-  status-scheduler works!
-</p>
+<div class="scheduler">
+
+</div>
\ No newline at end of file
diff --git a/src/app/components/create-status/status-scheduler/status-scheduler.component.scss b/src/app/components/create-status/status-scheduler/status-scheduler.component.scss
index e69de29b..4907048f 100644
--- a/src/app/components/create-status/status-scheduler/status-scheduler.component.scss
+++ b/src/app/components/create-status/status-scheduler/status-scheduler.component.scss
@@ -0,0 +1,7 @@
+@import "variables";
+
+.scheduler {
+    background-color: $scheduler-background;
+    min-height: 30px;
+    margin: 0 5px;
+}
\ No newline at end of file
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index 03ca6fe4..ab7d64bc 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -80,4 +80,12 @@ $autosuggest-entry-color-hover: #e2e2e2;
 $autosuggest-entry-handle-color-hover: #ffffff;
 
 $scrollbar-color: #08090d;
-$scrollbar-color-thumb: lighten($color-primary, 5);
\ No newline at end of file
+$scrollbar-color-thumb: lighten($color-primary, 5);
+
+$poll-editor-background: #3e455f;
+$poll-editor-background: #32384d;
+$poll-editor-background: #fff;
+
+$poll-editor-separator: #e7e7e7;
+
+$scheduler-background: #32384d;
\ No newline at end of file