Short peptides and derivatives or analogs thereof for the treatment or prevention of IAAP related disorders, in particular amyloid deposits associated with Type I or Type II diabetes are herein described. These peptides and/or their derivatives have been designed to inhibit the formation of amylin fibrils which are implicated in the pathogenesis of diabetes Type II as well as to dissolve the fibrillar deposits already formed