diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index 18ad13563..ff23682e7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -10,6 +10,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
 import android.widget.ImageView
+import android.widget.RelativeLayout
 import androidx.core.app.NotificationManagerCompat
 import com.simplemobiletools.calendar.pro.R
 import com.simplemobiletools.calendar.pro.dialogs.*
@@ -25,8 +26,10 @@ import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.RadioItem
+import com.simplemobiletools.commons.views.MyEditText
 import kotlinx.android.synthetic.main.activity_event.*
 import kotlinx.android.synthetic.main.activity_event.view.*
+import kotlinx.android.synthetic.main.item_attendee.view.*
 import org.joda.time.DateTime
 import java.util.*
 import java.util.regex.Pattern
@@ -58,7 +61,8 @@ class EventActivity : SimpleActivity() {
     private var mDialogTheme = 0
     private var mEventOccurrenceTS = 0L
     private var mEventCalendarId = STORED_LOCALLY_ONLY
-    private var wasActivityInitialized = false
+    private var mWasActivityInitialized = false
+    private var mAttendeeViews = ArrayList<MyEditText>()
 
     private lateinit var mEventStartDateTime: DateTime
     private lateinit var mEventEndDateTime: DateTime
@@ -123,6 +127,7 @@ class EventActivity : SimpleActivity() {
             updateTexts()
             updateEventType()
             updateCalDAVCalendar()
+            updateAttendees()
         }
 
         event_show_on_map.setOnClickListener { showOnMap() }
@@ -181,12 +186,12 @@ class EventActivity : SimpleActivity() {
 
         updateTextColors(event_scrollview)
         updateIconColors()
-        wasActivityInitialized = true
+        mWasActivityInitialized = true
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_event, menu)
-        if (wasActivityInitialized) {
+        if (mWasActivityInitialized) {
             menu.findItem(R.id.delete).isVisible = mEvent.id != null
             menu.findItem(R.id.share).isVisible = mEvent.id != null
             menu.findItem(R.id.duplicate).isVisible = mEvent.id != null
@@ -207,7 +212,7 @@ class EventActivity : SimpleActivity() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        if (!wasActivityInitialized) {
+        if (!mWasActivityInitialized) {
             return
         }
 
@@ -258,6 +263,7 @@ class EventActivity : SimpleActivity() {
         updateTexts()
         updateEventType()
         updateCalDAVCalendar()
+        updateAttendees()
     }
 
     private fun updateTexts() {
@@ -860,6 +866,7 @@ class EventActivity : SimpleActivity() {
             flags = mEvent.flags.addBitIf(event_all_day.isChecked, FLAG_ALL_DAY)
             repeatLimit = if (repeatInterval == 0) 0 else mRepeatLimit
             repeatRule = mRepeatRule
+            attendees = mAttendeeViews.map { it.value }.filter { it.isNotEmpty() }.toMutableList() as ArrayList<String>
             eventType = newEventType
             lastUpdated = System.currentTimeMillis()
             source = newSource
@@ -1075,6 +1082,24 @@ class EventActivity : SimpleActivity() {
         }
     }
 
+    private fun updateAttendees() {
+        addAttendee()
+        event_attendees_image.layoutParams.height = event_repetition_image.height
+    }
+
+    private fun addAttendee() {
+        val attendeeHolder = layoutInflater.inflate(R.layout.item_attendee, event_attendees_holder, false) as RelativeLayout
+        mAttendeeViews.add(attendeeHolder.event_attendee)
+        attendeeHolder.event_attendee.onTextChangeListener {
+            if (mAttendeeViews.none { it.value.isEmpty() }) {
+                addAttendee()
+            }
+        }
+
+        event_attendees_holder.addView(attendeeHolder)
+        attendeeHolder.event_attendee.setColors(config.textColor, getAdjustedPrimaryColor(), config.backgroundColor)
+    }
+
     private fun updateIconColors() {
         val textColor = config.textColor
         event_time_image.applyColorFilter(textColor)
@@ -1086,5 +1111,6 @@ class EventActivity : SimpleActivity() {
         event_reminder_1_type.applyColorFilter(textColor)
         event_reminder_2_type.applyColorFilter(textColor)
         event_reminder_3_type.applyColorFilter(textColor)
+        event_attendees_image.applyColorFilter(textColor)
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_people.png b/app/src/main/res/drawable-hdpi/ic_people.png
new file mode 100755
index 000000000..26691bec8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_people.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_people.png b/app/src/main/res/drawable-xhdpi/ic_people.png
new file mode 100755
index 000000000..93f23280c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_people.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_people.png b/app/src/main/res/drawable-xxhdpi/ic_people.png
new file mode 100755
index 000000000..6695583fe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_people.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_people.png b/app/src/main/res/drawable-xxxhdpi/ic_people.png
new file mode 100755
index 000000000..594db41ff
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_people.png differ
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index 05c2e4403..7b1bfe893 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -380,10 +380,40 @@
             android:importantForAccessibility="no"/>
 
         <ImageView
-            android:id="@+id/event_caldav_calendar_image"
+            android:id="@+id/event_attendees_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_below="@+id/event_repetition_divider"
+            android:layout_alignTop="@+id/event_attendees_holder"
+            android:layout_marginStart="@dimen/normal_margin"
+            android:layout_marginTop="@dimen/small_margin"
+            android:alpha="0.8"
+            android:padding="@dimen/medium_margin"
+            android:src="@drawable/ic_people"/>
+
+        <LinearLayout
+            android:id="@+id/event_attendees_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/event_repetition_divider"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:layout_toEndOf="@+id/event_attendees_image"
+            android:orientation="vertical"/>
+
+        <ImageView
+            android:id="@+id/event_attendees_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_below="@+id/event_attendees_holder"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="@color/divider_grey"
+            android:importantForAccessibility="no"/>
+
+        <ImageView
+            android:id="@+id/event_caldav_calendar_image"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/event_attendees_divider"
             android:layout_alignTop="@+id/event_caldav_calendar_holder"
             android:layout_alignBottom="@+id/event_caldav_calendar_holder"
             android:layout_marginStart="@dimen/normal_margin"
@@ -396,7 +426,7 @@
             android:id="@+id/event_caldav_calendar_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/event_repetition_divider"
+            android:layout_below="@+id/event_attendees_divider"
             android:layout_toEndOf="@+id/event_caldav_calendar_image"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone">
diff --git a/app/src/main/res/layout/item_attendee.xml b/app/src/main/res/layout/item_attendee.xml
new file mode 100644
index 000000000..5eb797fcf
--- /dev/null
+++ b/app/src/main/res/layout/item_attendee.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/event_attendee_holder"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/medium_margin"
+    android:paddingBottom="@dimen/medium_margin">
+
+    <com.simplemobiletools.commons.views.MyEditText
+        android:id="@+id/event_attendee"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/activity_margin"
+        android:hint="@string/add_another_attendee"
+        android:lines="1"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textCursorDrawable="@null"
+        android:textSize="@dimen/bigger_text_size"/>
+
+</RelativeLayout>